From e71ade7e92f4aaf5d50cfe488fadb12ddb107d55 Mon Sep 17 00:00:00 2001 From: Greg Neagle Date: Wed, 29 Jul 2020 13:01:28 -0700 Subject: [PATCH 1/2] Update README.md --- README.md | 1 + 1 file changed, 1 insertion(+) diff --git a/README.md b/README.md index 1975369..bd71934 100644 --- a/README.md +++ b/README.md @@ -30,6 +30,7 @@ Product installation failed. Use a compatible Mac or select a different build compatible with your current hardware and try again. You may also have success running the script in a VM; the InstallationCheck script in versions of the macOS installer to date skips the checks (and returns success) when run on a VM. +##### important note for Catalina+ Catalina privacy protections might interfere with the operation of this tool if you run it from ~/Desktop, ~/Documents, ~/Downloads or other directories protected in Catalina. Consider using /Users/Shared (or subdirectory) as the "working space" for this tool. Graham Pugh has a fork with a lot more features and bells and whistles. Check it out if your needs aren't met by this tool. https://github.com/grahampugh/macadmin-scripts From e59d8b84cb6a155cbdc72e82eb144d839fe7c57a Mon Sep 17 00:00:00 2001 From: Nate Walck Date: Fri, 18 Sep 2020 16:41:31 -0400 Subject: [PATCH 2/2] Add check for running from current user directory and bail with warning (#65) * Add check for running from special dirs that apple thinks need approval and warn --- installinstallmacos.py | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/installinstallmacos.py b/installinstallmacos.py index 47c4571..1a0c6eb 100755 --- a/installinstallmacos.py +++ b/installinstallmacos.py @@ -506,6 +506,16 @@ def main(): sys.exit('This command requires root (to install packages), so please ' 'run again with sudo or as root.') + current_dir = os.getcwd() + if os.path.expanduser("~") in current_dir: + bad_dirs = ['Documents', 'Desktop', 'Downloads', 'Library'] + for bad_dir in bad_dirs: + if bad_dir in os.path.split(this_dir): + print('Running this script from %s may not work as expected. ' + 'If this does not run as expected, please run again from ' + 'somewhere else, such as /Users/Shared.' + % current_dir, file=sys.stderr) + if args.catalogurl: su_catalog_url = args.catalogurl elif args.seedprogram: