Mercurial Repositories > eric / file diff

--- a/scripts/uninstall.py	Sun Oct 02 11:44:07 2022 +0200
+++ b/scripts/uninstall.py	Sat Oct 29 15:24:59 2022 +0200
@@ -131,6 +131,7 @@
         "eric7_editor",
         "eric7_hexeditor",
         "eric7_iconeditor",
+        "eric7_ide",
         "eric7_plugininstall",
         "eric7_pluginrepository",
         "eric7_pluginuninstall",
@@ -144,9 +145,9 @@
         "eric7_trpreviewer",
         "eric7_uipreviewer",
         "eric7_virtualenv",
-        "eric7",
         # obsolete scripts below
         "eric7_unittest",
+        "eric7",
     ]
 
     try:
@@ -208,7 +209,8 @@
                 for apiname in glob.glob(
                     os.path.join(apidir, progLanguage, "*.bas")
                 ) + glob.glob(os.path.join(apidir, progLanguage.lower(), "*.bas")):
-                    os.remove(apiname)
+                    if os.path.exists(apiname):
+                        os.remove(apiname)
 
                 # remove empty directories
                 with contextlib.suppress(FileNotFoundError, OSError):
@@ -284,28 +286,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/applications/eric7_browser.desktop",
+            "/usr/share/applications/eric7_ide.desktop",
+            "/usr/share/icons/eric.png",
+            "/usr/share/icons/ericWeb.png",
             "/usr/share/pixmaps/eric.png",
             "/usr/share/pixmaps/ericWeb.png",
-            "/usr/share/icons/eric.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/applications/eric7_browser.desktop",
+            "~/.local/share/applications/eric7_ide.desktop",
+            "~/.local/share/icons/eric.png",
+            "~/.local/share/icons/ericWeb.png",
             "~/.local/share/pixmaps/eric.png",
             "~/.local/share/pixmaps/ericWeb.png",
-            "~/.local/share/icons/eric.png",
-            "~/.local/share/icons/ericWeb.png",
+            # obsolete entries below
+            "~/.local/share/applications/eric7.desktop",
         ]:
             path = os.path.expanduser(name)
             if os.path.exists(path):
@@ -446,8 +452,10 @@
     """
     majorVersion, minorVersion = sys.version_info[:2]
     linkTemplates = [
+        "eric7 IDE (Python {0}.{1}).lnk",
+        "eric7 Browser (Python {0}.{1}).lnk",
+        # obsolete entries below
         "eric7 (Python {0}.{1}).lnk",
-        "eric7 Browser (Python {0}.{1}).lnk",
     ]
 
     return [ll.format(majorVersion, minorVersion) for ll in linkTemplates]