--- install.py.orig 2019-05-04 05:26:43.000000000 -0400
+++ install.py 2019-05-12 15:14:07.000000000 -0400
# set install prefix, if not None
for key in list(cfg.keys()):
- cfg[key] = os.path.normpath(os.path.join(distDir, cfg[key]))
+ cfg[key] = os.path.normpath(distDir + os.sep + cfg[key])
os.makedirs(dirs["icns"])
- if macPythonExe == defaultMacPythonExe:
- starter = os.path.join(dirs["exe"], "eric")
- os.symlink(macPythonExe, starter)
- starter = "python{0}".format(sys.version_info.major)
+## if macPythonExe == defaultMacPythonExe:
+## starter = os.path.join(dirs["exe"], "eric")
+## os.symlink(macPythonExe, starter)
+## starter = "python{0}".format(sys.version_info.major)
+ starter = "@@PYTHON_BIN_NAME@@"
wname = os.path.join(dirs["exe"], "eric6")
pathLine = "PATH={0}\n".format(os.pathsep.join(pathlist_n))
+ pydir = "@@PYTHON_PKG_DIR@@"
+ pyqt_ver = "@@PYQT_VERSION@@"
# create the wrapper script
wrapper = ('''#!/bin/sh\n'''
- '''exec "{2}" "{3}/{4}.py" "$@"\n'''
- .format(pathLine, dyldLine, starter, pydir, "eric6"))
+ '''exec "{2}" "{3}/{4}.py" "{5}" "$@"\n'''
+ .format(pathLine, dyldLine, starter, pydir, "eric6", pyqt_ver))
copyToFile(wname, wrapper)