Fixed an issue in the install.py script where some paths didn't honour the distDir settings.

Sat, 10 Jul 2010 12:09:58 +0200

author
Detlev Offenbach <detlev@die-offenbachs.de>
date
Sat, 10 Jul 2010 12:09:58 +0200
changeset 386
58c14f563abc
parent 384
59598e0404da
child 388
174d7a46f58d

Fixed an issue in the install.py script where some paths didn't honour the distDir settings.

install.py file | annotate | diff | comparison | revisions
--- a/install.py	Sun Jul 04 20:47:26 2010 +0200
+++ b/install.py	Sat Jul 10 12:09:58 2010 +0200
@@ -411,8 +411,16 @@
     
     # create menu entry for Linux systems
     if sys.platform.startswith("linux"):
-        shutil.copy(os.path.join("eric", "icons", "default", "eric.png"), "/usr/share/pixmaps")
-        shutil.copy(os.path.join("eric", "eric5.desktop"), "/usr/share/applications")
+        if distDir:
+            shutil.copy(os.path.join("eric", "icons", "default", "eric.png"), 
+                os.path.normpath(os.path.join(distDir, "/usr/share/pixmaps")))
+            shutil.copy(os.path.join("eric", "eric5.desktop"), 
+                os.path.normpath(os.path.join(distDir, "/usr/share/applications")))
+        else:
+            shutil.copy(os.path.join("eric", "icons", "default", "eric.png"), 
+                "/usr/share/pixmaps")
+            shutil.copy(os.path.join("eric", "eric5.desktop"), 
+                "/usr/share/applications")
 
 
 def createInstallConfig():

eric ide

mercurial