diff --git a/docs/ChromeOS-Devices.md b/docs/ChromeOS-Devices.md index 4edc5b68..d0111462 100644 --- a/docs/ChromeOS-Devices.md +++ b/docs/ChromeOS-Devices.md @@ -105,6 +105,7 @@ The second form is backwards compatible with Standard GAM and selection with ``: +``` +autoupdatethrough +extendedsupporteligible +extendedsupportstart +extendedsupportenabled +``` + ### 6.76.03 Added option `folderpathonly []` to the following commands that causes GAM diff --git a/docs/How-to-Upgrade-from-Standard-GAM.md b/docs/How-to-Upgrade-from-Standard-GAM.md index 0a5b4b86..a065c519 100644 --- a/docs/How-to-Upgrade-from-Standard-GAM.md +++ b/docs/How-to-Upgrade-from-Standard-GAM.md @@ -335,7 +335,7 @@ writes the credentials into the file oauth2.txt. admin@server:/Users/admin/bin/gamadv-xtd3$ rm -f /Users/admin/GAMConfig/oauth2.txt admin@server:/Users/admin/bin/gamadv-xtd3$ ./gam version WARNING: Config File: /Users/admin/GAMConfig/gam.cfg, Section: DEFAULT, Item: oauth2_txt, Value: /Users/admin/GAMConfig/oauth2.txt, Not Found -GAMADV-XTD3 6.76.03 - https://github.com/taers232c/GAMADV-XTD3 - pythonsource +GAMADV-XTD3 6.76.04 - https://github.com/taers232c/GAMADV-XTD3 - pythonsource Ross Scroggs Python 3.12.3 64-bit final MacOS Sonoma 14.4.1 x86_64 @@ -1009,7 +1009,7 @@ writes the credentials into the file oauth2.txt. C:\GAMADV-XTD3>del C:\GAMConfig\oauth2.txt C:\GAMADV-XTD3>gam version WARNING: Config File: C:\GAMConfig\gam.cfg, Section: DEFAULT, Item: oauth2_txt, Value: C:\GAMConfig\oauth2.txt, Not Found -GAMADV-XTD3 6.76.03 - https://github.com/taers232c/GAMADV-XTD3 - pythonsource +GAMADV-XTD3 6.76.04 - https://github.com/taers232c/GAMADV-XTD3 - pythonsource Ross Scroggs Python 3.12.3 64-bit final Windows-10-10.0.17134 AMD64 diff --git a/docs/Version-and-Help.md b/docs/Version-and-Help.md index ae57dc01..dd160e60 100644 --- a/docs/Version-and-Help.md +++ b/docs/Version-and-Help.md @@ -3,7 +3,7 @@ Print the current version of Gam with details ``` gam version -GAMADV-XTD3 6.76.03 - https://github.com/taers232c/GAMADV-XTD3 - pythonsource +GAMADV-XTD3 6.76.04 - https://github.com/taers232c/GAMADV-XTD3 - pythonsource Ross Scroggs Python 3.12.3 64-bit final MacOS Sonoma 14.4.1 x86_64 @@ -15,7 +15,7 @@ Time: 2023-06-02T21:10:00-07:00 Print the current version of Gam with details and time offset information ``` gam version timeoffset -GAMADV-XTD3 6.76.03 - https://github.com/taers232c/GAMADV-XTD3 - pythonsource +GAMADV-XTD3 6.76.04 - https://github.com/taers232c/GAMADV-XTD3 - pythonsource Ross Scroggs Python 3.12.3 64-bit final MacOS Sonoma 14.4.1 x86_64 @@ -27,7 +27,7 @@ Your system time differs from www.googleapis.com by less than 1 second Print the current version of Gam with extended details and SSL information ``` gam version extended -GAMADV-XTD3 6.76.03 - https://github.com/taers232c/GAMADV-XTD3 - pythonsource +GAMADV-XTD3 6.76.04 - https://github.com/taers232c/GAMADV-XTD3 - pythonsource Ross Scroggs Python 3.12.3 64-bit final MacOS Sonoma 14.4.1 x86_64 @@ -64,7 +64,7 @@ MacOS High Sierra 10.13.6 x86_64 Path: /Users/Admin/bin/gamadv-xtd3 Version Check: Current: 5.35.08 - Latest: 6.76.03 + Latest: 6.76.04 echo $? 1 ``` @@ -72,7 +72,7 @@ echo $? Print the current version number without details ``` gam version simple -6.76.03 +6.76.04 ``` In Linux/MacOS you can do: ``` @@ -82,7 +82,7 @@ echo $VER Print the current version of Gam and address of this Wiki ``` gam help -GAM 6.76.03 - https://github.com/taers232c/GAMADV-XTD3 +GAM 6.76.04 - https://github.com/taers232c/GAMADV-XTD3 Ross Scroggs Python 3.12.3 64-bit final MacOS Sonoma 14.4.1 x86_64 diff --git a/src/GamCommands.txt b/src/GamCommands.txt index 95a69d90..a4a27c53 100644 --- a/src/GamCommands.txt +++ b/src/GamCommands.txt @@ -2230,6 +2230,7 @@ gam update + [quickcrosmove []] [nobatc annotatedlocation|location| annotateduser|user| autoupdateexpiration| + autoupdatethrough| backlightinfo| bootmode| cpuinfo| @@ -2242,6 +2243,9 @@ gam update + [quickcrosmove []] [nobatc dockmacaddress| ethernetmacaddress| ethernetmacaddress0| + extendedsupporteligible| + extendedsupportstart| + extendedsupportenabled| firmwareversion| firstenrollmenttime| lastdeprovisiontimestamp| diff --git a/src/GamUpdate.txt b/src/GamUpdate.txt index 716f23c5..370cc5bd 100644 --- a/src/GamUpdate.txt +++ b/src/GamUpdate.txt @@ -2,6 +2,16 @@ Merged GAM-Team version +6.76.04 + +Added the following fields to ``: +``` +autoupdatethrough +extendedsupporteligible +extendedsupportstart +extendedsupportenabled +``` + 6.76.03 Added option `folderpathonly []` to the following commands that causes GAM diff --git a/src/gam-install.sh b/src/gam-install.sh index 5c438b5f..b3d537ca 100755 --- a/src/gam-install.sh +++ b/src/gam-install.sh @@ -164,7 +164,7 @@ if [ -z ${GHCLIENT+x} ]; then check_type="unauthenticated" echo_yellow "Checking GitHub URL $release_url for $gamversion GAM release ($check_type)..." release_json=$(curl -s "$release_url" 2>&1 /dev/null) -lse +else check_type="authenticated" echo_yellow "Checking GitHub URL $release_url for $gamversion GAM release ($check_type)..." release_json=$(curl -s "$GHCLIENT" "$release_url" 2>&1 /dev/null) @@ -242,7 +242,11 @@ trap "rm -rf $temp_archive_dir" EXIT echo_yellow "Downloading file $name from $browser_download_url to $temp_archive_dir ($check_type)..." # Save archive to temp w/o losing our path -(cd "$temp_archive_dir" && curl -O -L $GHCLIENT $browser_download_url) +if [ -z ${GHCLIENT+x} ]; then + (cd "$temp_archive_dir" && curl -O -L $browser_download_url) +else + (cd "$temp_archive_dir" && curl -O -L $GHCLIENT $browser_download_url) +fi mkdir -p "$target_dir" diff --git a/src/gam/__init__.py b/src/gam/__init__.py index 7c34f653..0eb75ac5 100755 --- a/src/gam/__init__.py +++ b/src/gam/__init__.py @@ -23221,6 +23221,7 @@ CROS_FIELDS_CHOICE_MAP = { 'asset': 'annotatedAssetId', 'assetid': 'annotatedAssetId', 'autoupdateexpiration': 'autoUpdateExpiration', + 'autoupdatethrough': 'autoUpdateThrough', 'backlightinfo': 'backlightInfo', 'bootmode': 'bootMode', 'cpuinfo': 'cpuInfo', @@ -23233,6 +23234,9 @@ CROS_FIELDS_CHOICE_MAP = { 'dockmacaddress': 'dockMacAddress', 'ethernetmacaddress': 'ethernetMacAddress', 'ethernetmacaddress0': 'ethernetMacAddress0', + 'extendedsupporteligible': 'extendedSupportEligible', + 'extendedsupportstart': 'extendedSupportStart', + 'extendedsupportenabled': 'extendedSupportEnabled', 'firmwareversion': 'firmwareVersion', 'firstenrollmenttime': 'firstEnrollmentTime', 'lastdeprovisiontimestamp': 'lastDeprovisionTimestamp',