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

remove special characters

Browse Source
This commit is contained in:
Graham R Pugh 2021-04-18 14:46:22 +02:00
parent 27244b975b
commit 7fdc8064fb
1 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
installinstallmacos.py
View File

@ -994,7 +994,7 @@ def main():
if not_valid and ( if not_valid and (
args.validate args.validate
or (args.auto or args.version or args.os) or (args.auto or args.version or args.os)
# and not args.beta # not needed now we have DeviceID check # and not args.beta # not needed now we have DeviceID check
): ):
continue continue
@ -1010,7 +1010,7 @@ def main():
major = product_info[product_id]["version"].split(".", 2)[:2] major = product_info[product_id]["version"].split(".", 2)[:2]
os_version = ".".join(major) os_version = ".".join(major)
except ValueError: except ValueError:
#  Account for when no version information is given # Account for when no version information is given
os_version = "" os_version = ""
if args.os != os_version: if args.os != os_version:
continue continue
@ -1024,7 +1024,7 @@ def main():
except NameError: except NameError:
latest_valid_build = product_info[product_id]["BUILD"] latest_valid_build = product_info[product_id]["BUILD"]
# if using newer-than option, skip if not newer than the version # if using newer-than option, skip if not newer than the version
#  we are checking against # we are checking against
if args.newer_than_version: if args.newer_than_version:
latest_valid_build = get_latest_version( latest_valid_build = get_latest_version(
product_info[product_id]["version"], args.newer_than_version product_info[product_id]["version"], args.newer_than_version
@ -1044,7 +1044,7 @@ def main():
) )
if latest_valid_build == product_info[product_id]["BUILD"]: if latest_valid_build == product_info[product_id]["BUILD"]:
# if using newer-than option, skip if not newer than the version # if using newer-than option, skip if not newer than the version
#  we are checking against # we are checking against
if args.newer_than_version: if args.newer_than_version:
latest_valid_build = get_latest_version( latest_valid_build = get_latest_version(
product_info[product_id]["version"], product_info[product_id]["version"],
@ -1234,8 +1234,8 @@ def main():
print("Exiting.") print("Exiting.")
exit(0) exit(0)
#  shortened workflow if we just want a macOS Big Sur+ package # shortened workflow if we just want a macOS Big Sur+ package
#  taken from @scriptingosx's Fetch-Installer-Pkg project # taken from @scriptingosx's Fetch-Installer-Pkg project
# (https://github.com/scriptingosx/fetch-installer-pkg) # (https://github.com/scriptingosx/fetch-installer-pkg)
if args.pkg: if args.pkg:
product = catalog["Products"][product_id] product = catalog["Products"][product_id]