Merge branch 'master' of https://github.com/munki/macadmin-scripts into munki-master

This commit is contained in:
Graham 2019-11-07 14:12:53 -06:00
commit 83f7fb289e

View File

@ -556,10 +556,6 @@ def main():
'from the Apple software catalog' 'from the Apple software catalog'
'\n') '\n')
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 '
@ -626,6 +622,10 @@ def main():
print('%-17s: %s' % ('OS Version', build_info[0])) print('%-17s: %s' % ('OS Version', build_info[0]))
print('%-17s: %s\n' % ('Build ID', build_info[1])) print('%-17s: %s\n' % ('Build ID', build_info[1]))
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: