diff -r f4bb67586615 -r f06151820839 scripts/uninstall.py
--- a/scripts/uninstall.py Sun Oct 29 12:19:47 2023 +0100
+++ b/scripts/uninstall.py Sun Oct 29 15:50:37 2023 +0100
@@ -24,10 +24,8 @@
pyModDir = None
progLanguages = ["MicroPython", "Python3", "QSS"]
defaultMacAppBundleName = "eric7.app"
-if os.getuid() == 0:
- defaultMacAppBundlePath = "/Applications"
-else:
- defaultMacAppBundlePath = os.path.expanduser("~/Applications")
+defaultMacAppBundlePath = "/Applications"
+defaultMacUserAppBundlePath = os.path.expanduser("~/Applications")
settingsNameOrganization = "Eric7"
settingsNameGlobal = "eric7"
@@ -343,10 +341,15 @@
macAppBundlePath = getConfig("macAppBundlePath")
macAppBundleName = getConfig("macAppBundleName")
except AttributeError:
- macAppBundlePath = defaultMacAppBundlePath
+ macAppBundlePath = (
+ defaultMacAppBundlePath
+ if os.getpid() == 0
+ else defaultMacUserAppBundlePath
+ )
macAppBundleName = defaultMacAppBundleName
for bundlePath in [
os.path.join(defaultMacAppBundlePath, macAppBundleName),
+ os.path.join(defaultMacUserAppBundlePath, macAppBundleName),
os.path.join(macAppBundlePath, macAppBundleName),
]:
if os.path.exists(bundlePath):
