Mercurial Repositories > eric / file diff

--- a/scripts/install.py	Sun Apr 05 18:17:08 2020 +0200
+++ b/scripts/install.py	Sat May 02 13:51:07 2020 +0200
@@ -919,10 +919,10 @@
         if not os.path.exists(dst):
             os.makedirs(dst)
         shutilCopy(
-            os.path.join(eric6SourceDir, "icons", "default", "eric.png"),
+            os.path.join(eric6SourceDir, "pixmaps", "eric_icon.png"),
             os.path.join(dst, "eric.png"))
         shutilCopy(
-            os.path.join(eric6SourceDir, "icons", "default", "ericWeb48.png"),
+            os.path.join(eric6SourceDir, "pixmaps", "ericWeb48_icon.png"),
             os.path.join(dst, "ericWeb.png"))
         dst = os.path.normpath(
             os.path.join(distDir, "usr/share/applications"))
@@ -941,8 +941,8 @@
             os.path.join(sourceDir, "linux", "eric6.appdata.xml.in"),
             os.path.join(dst, "eric6.appdata.xml"))
     elif os.getuid() == 0:
-        shutilCopy(os.path.join(
-            eric6SourceDir, "icons", "default", "eric.png"),
+        shutilCopy(
+            os.path.join(eric6SourceDir, "pixmaps", "eric_icon.png"),
             "/usr/share/pixmaps/eric.png")
         copyDesktopFile(
             os.path.join(sourceDir, "linux", "eric6.desktop.in"),
@@ -955,8 +955,8 @@
             copyAppStreamFile(
                 os.path.join(sourceDir, "linux", "eric6.appdata.xml.in"),
                 "/usr/share/appdata/eric6.appdata.xml")
-        shutilCopy(os.path.join(
-            eric6SourceDir, "icons", "default", "ericWeb48.png"),
+        shutilCopy(
+            os.path.join(eric6SourceDir, "pixmaps", "ericWeb48_icon.png"),
             "/usr/share/pixmaps/ericWeb.png")
         copyDesktopFile(
             os.path.join(sourceDir, "linux", "eric6_browser.desktop.in"),
@@ -973,7 +973,7 @@
                 os.makedirs(directory)
         # now copy the files
         shutilCopy(
-            os.path.join(eric6SourceDir, "icons", "default", "eric.png"),
+            os.path.join(eric6SourceDir, "pixmaps", "eric_icon.png"),
             os.path.join(localPath, "pixmaps", "eric.png"))
         copyDesktopFile(
             os.path.join(sourceDir, "linux", "eric6.desktop.in"),
@@ -985,7 +985,7 @@
             os.path.join(sourceDir, "linux", "eric6.appdata.xml.in"),
             os.path.join(localPath, "appdata", "eric6.appdata.xml"))
         shutilCopy(
-            os.path.join(eric6SourceDir, "icons", "default", "ericWeb48.png"),
+            os.path.join(eric6SourceDir, "pixmaps", "ericWeb48_icon.png"),
             os.path.join(localPath, "pixmaps", "ericWeb.png"))
         copyDesktopFile(
             os.path.join(sourceDir, "linux", "eric6_browser.desktop.in"),