[patch] A patch that replaces the faulty sed command

eric-5.install.patch (text/plain), 4.54 KB, created by Per Pascal Seeland on 2016-07-13 19:36:40 UTC

diff -rupN eric-5.5.2/work/eric5-5.5.2/eric/install.py eric-5.5.2.orig/work/eric5-5.5.2/eric/install.py
--- eric-5.5.2/work/eric5-5.5.2/eric/install.py	2016-07-13 21:05:39.284073396 +0200
+++ eric-5.5.2.orig/work/eric5-5.5.2/eric/install.py	2016-07-13 21:04:40.762003236 +0200
@@ -754,7 +754,7 @@ def installEric():
                 os.makedirs(dst)
             shutilCopy(
                 os.path.join(sourceDir, "icons", "default", "eric5.png"),
-                os.path.join(dst, "eric" + marker + ".png"))
+                os.path.join(dst, "eric5" + marker + ".png"))
             shutilCopy(
                 os.path.join(sourceDir, "icons", "default", "ericWeb48.png"),
                 os.path.join(dst, "ericWeb" + marker + ".png"))
@@ -780,7 +780,7 @@ def installEric():
         elif os.getuid() == 0:
             shutilCopy(os.path.join(
                 sourceDir, "icons", "default", "eric5.png"),
-                "/usr/share/pixmaps/eric" + marker + ".png")
+                "/usr/share/pixmaps/eric5" + marker + ".png")
             copyDesktopFile(
                 os.path.join(sourceDir, "eric5.desktop"),
                 "/usr/share/applications/eric5" + marker + ".desktop",
@@ -828,7 +828,7 @@ def createMacAppBundle(pydir):
     os.makedirs(dirs["icns"])
     
     if macPythonExe == defaultMacPythonExe:
-        starter = os.path.join(dirs["exe"], "eric")
+        starter = os.path.join(dirs["exe"], "eric5")
         os.symlink(macPythonExe, starter)
     else:
         starter = "python{0}".format(sys.version_info.major)
diff -rupN eric-5.5.2/work/eric5-5.5.2/eric/uninstall.py eric-5.5.2.orig/work/eric5-5.5.2/eric/uninstall.py
--- eric-5.5.2/work/eric5-5.5.2/eric/uninstall.py	2014-12-01 14:03:52.365002522 +0100
+++ eric-5.5.2.orig/work/eric5-5.5.2/eric/uninstall.py	2016-07-13 21:04:40.758003368 +0200
@@ -108,7 +108,7 @@ def uninstallEric():
                      "/usr/share/appdata/eric5" + marker + ".appdata.xml",
                      "/usr/share/applications/eric5_webbrowser" + marker + 
                      ".desktop",
-                     "/usr/share/pixmaps/eric" + marker + ".png",
+                     "/usr/share/pixmaps/eric5" + marker + ".png",
                      "/usr/share/pixmaps/ericWeb" + marker + ".png"]:
             if os.path.exists(name):
                 os.remove(name)
diff -rupN eric-5.5.2/work/eric5-5.5.2/install.py eric-5.5.2.orig/work/eric5-5.5.2/install.py
--- eric-5.5.2/work/eric5-5.5.2/install.py	2016-07-13 21:05:39.289073231 +0200
+++ eric-5.5.2.orig/work/eric5-5.5.2/install.py	2016-07-13 21:04:40.765003137 +0200
@@ -754,7 +754,7 @@ def installEric():
                 os.makedirs(dst)
             shutilCopy(
                 os.path.join(sourceDir, "icons", "default", "eric5.png"),
-                os.path.join(dst, "eric" + marker + ".png"))
+                os.path.join(dst, "eric5" + marker + ".png"))
             shutilCopy(
                 os.path.join(sourceDir, "icons", "default", "ericWeb48.png"),
                 os.path.join(dst, "ericWeb" + marker + ".png"))
@@ -780,7 +780,7 @@ def installEric():
         elif os.getuid() == 0:
             shutilCopy(os.path.join(
                 sourceDir, "icons", "default", "eric5.png"),
-                "/usr/share/pixmaps/eric" + marker + ".png")
+                "/usr/share/pixmaps/eric5" + marker + ".png")
             copyDesktopFile(
                 os.path.join(sourceDir, "eric5.desktop"),
                 "/usr/share/applications/eric5" + marker + ".desktop",
@@ -828,7 +828,7 @@ def createMacAppBundle(pydir):
     os.makedirs(dirs["icns"])
     
     if macPythonExe == defaultMacPythonExe:
-        starter = os.path.join(dirs["exe"], "eric")
+        starter = os.path.join(dirs["exe"], "eric5")
         os.symlink(macPythonExe, starter)
     else:
         starter = "python{0}".format(sys.version_info.major)
diff -rupN eric-5.5.2/work/eric5-5.5.2/uninstall.py eric-5.5.2.orig/work/eric5-5.5.2/uninstall.py
--- eric-5.5.2/work/eric5-5.5.2/uninstall.py	2014-12-07 15:03:39.485725187 +0100
+++ eric-5.5.2.orig/work/eric5-5.5.2/uninstall.py	2016-07-13 21:04:40.762003236 +0200
@@ -108,7 +108,7 @@ def uninstallEric():
                      "/usr/share/appdata/eric5" + marker + ".appdata.xml",
                      "/usr/share/applications/eric5_webbrowser" + marker + 
                      ".desktop",
-                     "/usr/share/pixmaps/eric" + marker + ".png",
+                     "/usr/share/pixmaps/eric5" + marker + ".png",
                      "/usr/share/pixmaps/ericWeb" + marker + ".png"]:
             if os.path.exists(name):
                 os.remove(name)