Mercurial Repositories > eric / changeset

--- a/install.py	Mon Dec 01 07:45:06 2014 +0100
+++ b/install.py	Mon Dec 01 14:04:11 2014 +0100
@@ -49,10 +49,11 @@
 configName = 'eric5config.py'
 defaultMacAppBundleName = "eric5.app"
 defaultMacAppBundlePath = "/Applications"
-macAppBundleName = "eric5.app"
-macAppBundlePath = "/Applications"
-macPythonExe = "{0}/Resources/Python.app/Contents/MacOS/Python".format(
+defaultMacPythonExe = "{0}/Resources/Python.app/Contents/MacOS/Python".format(
     sys.exec_prefix)
+macAppBundleName = defaultMacAppBundleName
+macAppBundlePath = defaultMacAppBundlePath
+macPythonExe = defaultMacPythonExe
 
 # Define blacklisted versions of the prerequisites
 BlackLists = {
@@ -150,7 +151,7 @@
         print("    -n path   path of the directory the Mac app bundle will")
         print("              be created in")
         print("              (default: {0}".format(macAppBundlePath))
-        print("    -p python name of the python executable")
+        print("    -p python path of the python executable")
         print("              (default: {0})".format(macPythonExe))
     print("    -c        don't cleanup old installation first")
     print("    -x        don't perform dependency checks (use on your own"
@@ -537,7 +538,7 @@
             except AttributeError:
                 macAppBundlePath = defaultMacAppBundlePath
                 macAppBundleName = defaultMacAppBundleName
-            for bundlePath in [os.path.join(defaultMacAppBundleName,
+            for bundlePath in [os.path.join(defaultMacAppBundlePath,
                                             macAppBundleName),
                                os.path.join(macAppBundlePath,
                                             macAppBundleName),
@@ -826,7 +827,7 @@
     os.makedirs(dirs["exe"])
     os.makedirs(dirs["icns"])
     
-    if macAppBundleName == defaultMacAppBundleName:
+    if macPythonExe == defaultMacPythonExe:
         starter = os.path.join(dirs["exe"], "eric")
         os.symlink(macPythonExe, starter)
     else:

--- a/uninstall.py	Mon Dec 01 07:45:06 2014 +0100
+++ b/uninstall.py	Mon Dec 01 14:04:11 2014 +0100
@@ -199,7 +199,7 @@
             except AttributeError:
                 macAppBundlePath = defaultMacAppBundlePath
                 macAppBundleName = defaultMacAppBundleName
-            for bundlePath in [os.path.join(defaultMacAppBundleName,
+            for bundlePath in [os.path.join(defaultMacAppBundlePath,
                                             macAppBundleName),
                                os.path.join(macAppBundlePath,
                                             macAppBundleName),