--- a/scripts/uninstall.py Sun Oct 02 11:44:07 2022 +0200 +++ b/scripts/uninstall.py Sun Oct 02 14:18:49 2022 +0200 @@ -131,6 +131,7 @@ "eric7_editor", "eric7_hexeditor", "eric7_iconeditor", + "eric7_ide", "eric7_plugininstall", "eric7_pluginrepository", "eric7_pluginuninstall", @@ -144,9 +145,9 @@ "eric7_trpreviewer", "eric7_uipreviewer", "eric7_virtualenv", - "eric7", # obsolete scripts below "eric7_unittest", + "eric7", ] try: @@ -208,7 +209,8 @@ for apiname in glob.glob( os.path.join(apidir, progLanguage, "*.bas") ) + glob.glob(os.path.join(apidir, progLanguage.lower(), "*.bas")): - os.remove(apiname) + if os.path.exists(apiname): + os.remove(apiname) # remove empty directories with contextlib.suppress(FileNotFoundError, OSError): @@ -446,8 +448,10 @@ """ majorVersion, minorVersion = sys.version_info[:2] linkTemplates = [ + "eric7 IDE (Python {0}.{1}).lnk", + "eric7 Browser (Python {0}.{1}).lnk", + # obsolete entries below "eric7 (Python {0}.{1}).lnk", - "eric7 Browser (Python {0}.{1}).lnk", ] return [ll.format(majorVersion, minorVersion) for ll in linkTemplates]