Mercurial Repositories > eric / changeset

--- a/install.py	Wed Aug 06 18:54:06 2014 +0200
+++ b/install.py	Sat Aug 09 12:23:18 2014 +0200
@@ -341,7 +341,7 @@
     global pyModDir, progLanguages
     
     # Remove the menu entry for Linux systems
-    if sys.platform.startswith("linux"):
+    if sys.platform.startswith("linux") and os.getuid() == 0:
         for name in ["/usr/share/pixmaps/eric.png",
                      "/usr/share/applications/eric5.desktop",
                      "/usr/share/appdata/eric5.appdata.xml",
@@ -655,7 +655,7 @@
             if not os.path.exists(dst):
                 os.makedirs(dst)
             shutilCopy(os.path.join(sourceDir, "eric5.appdata.xml"), dst)
-        else:
+        elif os.getuid() == 0:
             shutilCopy(os.path.join(
                 sourceDir, "icons", "default", "eric.png"),
                 "/usr/share/pixmaps/eric.png")

--- a/uninstall.py	Wed Aug 06 18:54:06 2014 +0200
+++ b/uninstall.py	Sat Aug 09 12:23:18 2014 +0200
@@ -89,9 +89,10 @@
     global pyModDir
     
     # Remove the menu entry for Linux systems
-    if sys.platform.startswith("linux"):
+    if sys.platform.startswith("linux") and os.getuid() == 0:
         for name in ["/usr/share/pixmaps/eric.png",
                      "/usr/share/applications/eric5.desktop",
+                     "/usr/share/appdata/eric6.appdata.xml",
                      "/usr/share/pixmaps/ericWeb.png",
                      "/usr/share/applications/eric5_webbrowser.desktop"]:
             if os.path.exists(name):