From: Cameron Katri <me@cameronkatri.com>
Date: Mon, 18 Oct 2021 03:02:55 +0000 (-0400)
Subject: Use new beta directory structure
X-Git-Url: https://git.cameronkatri.com/tsssave.git/commitdiff_plain/5304af7fbc5739e4d373a8ff5639dc5144c59f89

Use new beta directory structure
---

diff --git a/tsssave b/tsssave
index accccf2..cae16f7 100755
--- a/tsssave
+++ b/tsssave
@@ -76,15 +76,15 @@ for device in $(yq e '.devices | keys | .[]' ${config}); do
 	# BETA VERSIONS
 	
 	for signed in $(curl -sL https://api.m1sta.xyz/betas/${deviceid} | jq -re '.[] | select(.signed == true) | .buildid'); do
-		version="$(curl -s https://api.m1sta.xyz/betas/${deviceid} | jq -re ".[] | select(.buildid == \"${signed}\") | .version")"
-		if [ -e ${output}/${device}/${version}/beta/$(printf "%d\n" ${ecid})_${deviceid}_$(printf "${board}\n" | tr '[A-Z]' '[a-z]')_*-${signed}_*.shsh2 ]; then
+		version="$(curl -s https://api.m1sta.xyz/betas/${deviceid} | jq -re ".[] | select(.buildid == \"${signed}\") | .version" | sed 's/ /-/g')"
+		if [ -e ${output}/${device}/${version}/$(printf "%d\n" ${ecid})_${deviceid}_$(printf "${board}\n" | tr '[A-Z]' '[a-z]')_*-${signed}_*.shsh2 ]; then
 			printf "Skipping %s...\n" ${signed}
 		else
 			printf "Saving %s...\n" ${signed}
 			pzb "$(curl -sL https://api.m1sta.xyz/betas/${deviceid} | jq -re ".[] | select(.buildid == \"${signed}\") | .url")" -g BuildManifest.plist -o BuildManifest-${board}-${signed}.plist
-			mkdir -p ${output}/${device}/${version}/beta/
+			mkdir -p ${output}/${device}/${version}/
 			tsschecker -d "${deviceid}" -B "${board}" -m /tmp/BuildManifest-${board}-${signed}.plist -s -e "${ecid}" --generator "${generator}" \
-				--apnonce "${apnonce}" --save-path ${output}/${device}/${version}/beta/
+				--apnonce "${apnonce}" --save-path ${output}/${device}/${version}/
 		fi
 	done
 done