Mercurial Repositories > eric / file diff

--- a/scripts/install.py	Sun Oct 02 14:18:49 2022 +0200
+++ b/scripts/install.py	Sun Oct 02 14:46:21 2022 +0200
@@ -626,28 +626,32 @@
     """
     if os.getuid() == 0:
         for name in [
-            "/usr/share/applications/eric7.desktop",
             "/usr/share/appdata/eric7.appdata.xml",
             "/usr/share/metainfo/eric7.appdata.xml",
-            "/usr/share/pixmaps/eric.png",
+            "/usr/share/applications/eric7_browser.desktop",
+            "/usr/share/applications/eric7_ide.desktop",
             "/usr/share/icons/eric.png",
-            "/usr/share/applications/eric7_browser.desktop",
+            "/usr/share/icons/ericWeb.png",
+            "/usr/share/pixmaps/eric.png",
             "/usr/share/pixmaps/ericWeb.png",
-            "/usr/share/icons/ericWeb.png",
+            # obsolete entries below
+            "/usr/share/applications/eric7.desktop",
         ]:
             if os.path.exists(name):
                 os.remove(name)
     elif os.getuid() >= 1000:
         # it is assumed that user ids start at 1000
         for name in [
-            "~/.local/share/applications/eric7.desktop",
             "~/.local/share/appdata/eric7.appdata.xml",
             "~/.local/share/metainfo/eric7.appdata.xml",
-            "~/.local/share/pixmaps/eric.png",
+            "~/.local/share/applications/eric7_browser.desktop",
+            "~/.local/share/applications/eric7_ide.desktop",
             "~/.local/share/icons/eric.png",
-            "~/.local/share/applications/eric7_browser.desktop",
+            "~/.local/share/icons/ericWeb.png",
+            "~/.local/share/pixmaps/eric.png",
             "~/.local/share/pixmaps/ericWeb.png",
-            "~/.local/share/icons/ericWeb.png",
+            # obsolete entries below
+            "~/.local/share/applications/eric7.desktop",
         ]:
             path = os.path.expanduser(name)
             if os.path.exists(path):
@@ -994,8 +998,8 @@
         if not os.path.exists(dst):
             os.makedirs(dst)
         copyDesktopFile(
-            os.path.join(dataSourceDir, "eric7.desktop.in"),
-            os.path.join(dst, "eric7.desktop"),
+            os.path.join(dataSourceDir, "eric7_ide.desktop.in"),
+            os.path.join(dst, "eric7_ide.desktop"),
         )
         copyDesktopFile(
             os.path.join(dataSourceDir, "eric7_browser.desktop.in"),
@@ -1019,8 +1023,8 @@
             "/usr/share/icons/hicolor/48x48/apps/eric.png",
         )
         copyDesktopFile(
-            os.path.join(dataSourceDir, "eric7.desktop.in"),
-            "/usr/share/applications/eric7.desktop",
+            os.path.join(dataSourceDir, "eric7_ide.desktop.in"),
+            "/usr/share/applications/eric7_ide.desktop",
         )
         if os.path.exists("/usr/share/metainfo"):
             copyAppStreamFile(
@@ -1070,8 +1074,8 @@
             os.path.join(localPath, "icons/hicolor/48x48/apps", "eric.png"),
         )
         copyDesktopFile(
-            os.path.join(dataSourceDir, "eric7.desktop.in"),
-            os.path.join(localPath, "applications", "eric7.desktop"),
+            os.path.join(dataSourceDir, "eric7_ide.desktop.in"),
+            os.path.join(localPath, "applications", "eric7_ide.desktop"),
         )
         copyAppStreamFile(
             os.path.join(dataSourceDir, "eric7.appdata.xml.in"),