External/macadmin-scripts
1
0
Fork 0
mirror of https://github.com/grahampugh/macadmin-scripts.git synced 2025-12-17 17:56:33 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #27 from carlashley/master

Browse Source 
Move `os.getuid()` check
This commit is contained in:
Greg Neagle 2019-11-03 09:42:04 -08:00 committed by GitHub
commit 697639f164
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
installinstallmacos.py
View File

@ -459,10 +459,6 @@ def find_installer_app(mountpoint):
def main(): def main():
'''Do the main thing here''' '''Do the main thing here'''
if os.getuid() != 0:
sys.exit('This command requires root (to install packages), so please '
'run again with sudo or as root.')
parser = argparse.ArgumentParser() parser = argparse.ArgumentParser()
parser.add_argument('--seedprogram', default='', parser.add_argument('--seedprogram', default='',
help='Which Seed Program catalog to use. Valid values ' help='Which Seed Program catalog to use. Valid values '
@ -488,6 +484,10 @@ def main():
help='Ignore any previously cached files.') help='Ignore any previously cached files.')
args = parser.parse_args() args = parser.parse_args()
if os.getuid() != 0:
sys.exit('This command requires root (to install packages), so please '
'run again with sudo or as root.')
if args.catalogurl: if args.catalogurl:
su_catalog_url = args.catalogurl su_catalog_url = args.catalogurl
elif args.seedprogram: elif args.seedprogram: