Mercurial Repositories > eric / file diff

--- a/scripts/install.py	Sat Apr 17 18:46:26 2021 +0200
+++ b/scripts/install.py	Sun Apr 18 12:20:14 2021 +0200
@@ -582,10 +582,6 @@
     Clean up Linux specific files.
     """
     if os.getuid() == 0:
-        for name in ["/usr/share/pixmaps/eric.png",
-                     "/usr/share/pixmaps/ericWeb.png"]:
-            if os.path.exists(name):
-                os.remove(name)
         for name in [
             "/usr/share/applications/eric6.desktop",
             "/usr/share/appdata/eric6.appdata.xml",
@@ -593,6 +589,8 @@
             "/usr/share/applications/eric6_browser.desktop",
             "/usr/share/pixmaps/eric.png",
             "/usr/share/pixmaps/ericWeb.png",
+            "/usr/share/icons/eric.png",
+            "/usr/share/icons/ericWeb.png",
             # from Python2 era
             "/usr/share/applications/eric6_webbrowser.desktop",
         ]:
@@ -600,11 +598,6 @@
                 os.remove(name)
     elif os.getuid() >= 1000:
         # it is assumed that user ids start at 1000
-        for name in ["~/.local/share/pixmaps/eric.png",
-                     "~/.local/share/pixmaps/ericWeb.png"]:
-            path = os.path.expanduser(name)
-            if os.path.exists(path):
-                os.remove(path)
         for name in [
             "~/.local/share/applications/eric6.desktop",
             "~/.local/share/appdata/eric6.appdata.xml",
@@ -612,6 +605,8 @@
             "~/.local/share/applications/eric6_browser.desktop",
             "~/.local/share/pixmaps/eric.png",
             "~/.local/share/pixmaps/ericWeb.png",
+            "~/.local/share/icons/eric.png",
+            "~/.local/share/icons/ericWeb.png",
             # from Python2 era
             "/usr/share/applications/eric6_webbrowser.desktop",
         ]:
@@ -935,7 +930,7 @@
     global distDir, sourceDir
     
     if distDir:
-        dst = os.path.normpath(os.path.join(distDir, "usr/share/pixmaps"))
+        dst = os.path.normpath(os.path.join(distDir, "usr/share/icons"))
         if not os.path.exists(dst):
             os.makedirs(dst)
         shutilCopy(
@@ -963,7 +958,7 @@
     elif os.getuid() == 0:
         shutilCopy(
             os.path.join(eric6SourceDir, "pixmaps", "eric_icon.png"),
-            "/usr/share/pixmaps/eric.png")
+            "/usr/share/icons/eric.png")
         copyDesktopFile(
             os.path.join(sourceDir, "linux", "eric6.desktop.in"),
             "/usr/share/applications/eric6.desktop")
@@ -977,7 +972,7 @@
                 "/usr/share/appdata/eric6.appdata.xml")
         shutilCopy(
             os.path.join(eric6SourceDir, "pixmaps", "ericWeb48_icon.png"),
-            "/usr/share/pixmaps/ericWeb.png")
+            "/usr/share/icons/ericWeb.png")
         copyDesktopFile(
             os.path.join(sourceDir, "linux", "eric6_browser.desktop.in"),
             "/usr/share/applications/eric6_browser.desktop")
@@ -987,14 +982,14 @@
                                  ".local", "share")
         # create directories first
         for directory in [os.path.join(localPath, name)
-                          for name in ("pixmaps", "applications",
+                          for name in ("icons", "applications",
                                        "metainfo", "appdata")]:
             if not os.path.isdir(directory):
                 os.makedirs(directory)
         # now copy the files
         shutilCopy(
             os.path.join(eric6SourceDir, "pixmaps", "eric_icon.png"),
-            os.path.join(localPath, "pixmaps", "eric.png"))
+            os.path.join(localPath, "icons", "eric.png"))
         copyDesktopFile(
             os.path.join(sourceDir, "linux", "eric6.desktop.in"),
             os.path.join(localPath, "applications", "eric6.desktop"))
@@ -1006,7 +1001,7 @@
             os.path.join(localPath, "appdata", "eric6.appdata.xml"))
         shutilCopy(
             os.path.join(eric6SourceDir, "pixmaps", "ericWeb48_icon.png"),
-            os.path.join(localPath, "pixmaps", "ericWeb.png"))
+            os.path.join(localPath, "icons", "ericWeb.png"))
         copyDesktopFile(
             os.path.join(sourceDir, "linux", "eric6_browser.desktop.in"),
             os.path.join(localPath, "applications", "eric6_browser.desktop"))