diff -r e143a7e7254b -r b9c8dc3b7da1 scripts/install.py
--- a/scripts/install.py Sat Oct 01 20:06:27 2022 +0200
+++ b/scripts/install.py Sun Oct 02 11:29:11 2022 +0200
@@ -522,6 +522,7 @@
"eric7_editor",
"eric7_hexeditor",
"eric7_iconeditor",
+ "eric7_ide",
"eric7_plugininstall",
"eric7_pluginrepository",
"eric7_pluginuninstall",
@@ -535,9 +536,9 @@
"eric7_trpreviewer",
"eric7_uipreviewer",
"eric7_virtualenv",
- "eric7",
# obsolete scripts below
"eric7_unittest",
+ "eric7",
]
try:
@@ -756,6 +757,7 @@
"eric7_editor",
"eric7_hexeditor",
"eric7_iconeditor",
+ "eric7_ide",
"eric7_plugininstall",
"eric7_pluginrepository",
"eric7_pluginuninstall",
@@ -769,7 +771,6 @@
"eric7_uipreviewer",
"eric7_testing",
"eric7_virtualenv",
- "eric7",
]:
wnames.append(createPyWrapper(cfg["ericDir"], name, scriptsDir))
@@ -1178,7 +1179,7 @@
else:
starter = "python{0}".format(sys.version_info.major)
- wname = os.path.join(directories["exe"], "eric7")
+ wname = os.path.join(directories["exe"], "eric7_ide")
# determine entry for DYLD_FRAMEWORK_PATH
dyldLine = ""
@@ -1209,8 +1210,10 @@
"""\n"""
"""{0}"""
"""{1}"""
- """exec "{2}" "{3}/{4}.py" "$@"\n""".format(
- pathLine, dyldLine, starter, pydir, "eric7"
+ """exec "{2}" "-m" "eric7" "$@"\n""".format(
+ pathLine, dyldLine, starter
+## """exec "{2}" "{3}/{4}.py" "$@"\n""".format(
+## pathLine, dyldLine, starter, pydir, "eric7"
)
)
copyToFile(wname, wrapper)
@@ -1239,7 +1242,7 @@
"""<plist version="1.0">\n"""
"""<dict>\n"""
""" <key>CFBundleExecutable</key>\n"""
- """ <string>eric7</string>\n"""
+ """ <string>eric7_ide</string>\n"""
""" <key>CFBundleIconFile</key>\n"""
""" <string>eric.icns</string>\n"""
""" <key>CFBundleInfoDictionaryVersion</key>\n"""
@@ -2033,8 +2036,8 @@
majorVersion, minorVersion = sys.version_info[:2]
entriesTemplates = [
(
- "eric7 (Python {0}.{1}).lnk",
- os.path.join(cfg["bindir"], "eric7.cmd"),
+ "eric7 IDE (Python {0}.{1}).lnk",
+ os.path.join(cfg["bindir"], "eric7_ide.cmd"),
os.path.join(cfg["ericPixDir"], "eric7.ico"),
),
(
@@ -2057,7 +2060,7 @@
@rtype str
"""
majorVersion, minorVersion = sys.version_info[:2]
- return "eric7 (Python {0}.{1})".format(majorVersion, minorVersion)
+ return "eric7 IDE (Python {0}.{1})".format(majorVersion, minorVersion)
def main(argv):
