From 33a42b129be5816841de5984ea7909300ebf118d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?S=C3=B8ren=20Theilgaard?= <soren@theilgaard.dk>
Date: Tue, 23 Mar 2021 13:46:31 +0100
Subject: [PATCH] Updated for packageID

---
 buildCaseStatement.sh | 58 +++++++++++++++++++++++++++++++++----------
 1 file changed, 45 insertions(+), 13 deletions(-)

diff --git a/buildCaseStatement.sh b/buildCaseStatement.sh
index 8c8eda5..4087013 100755
--- a/buildCaseStatement.sh
+++ b/buildCaseStatement.sh
@@ -18,22 +18,47 @@ if ! cd "$tmpDir"; then
     exit 1
 fi
 
-# download the dmg
+# download the URL
 echo "Downloading $downloadURL"
-if ! curl --location --fail --silent "$downloadURL" --remote-header-name --remote-name; then
+if ! archivePath=$(curl -fsL "$downloadURL" --remote-header-name --remote-name -w "%{filename_effective}"); then
     echo "error downloading $downloadURL"
     exit 2
 fi
 
-archivePath=$(find $tmpDir -print )
+xpath() {
+    # the xpath tool changes in Big Sur and now requires the `-e` option
+    if [[ $(sw_vers -buildVersion) > "20A" ]]; then
+        /usr/bin/xpath -e $@
+        # alternative: switch to xmllint (which is not perl)
+        #xmllint --xpath $@ -
+    else
+        /usr/bin/xpath $@
+    fi
+}
+
+#archivePath=$(find $tmpDir -print )
+echo "archivePath: $archivePath"
 archiveName=${archivePath##*/}
+echo "archiveName: $archiveName"
 name=${archiveName%.*}
+echo "name: $name"
 archiveExt=${archiveName##*.}
+echo "archiveExt: $archiveExt"
 identifier=$(echo $name | tr '[:upper:]' '[:lower:]')
+echo "identifier: $identifier"
 
 if [ "$archiveExt" = "pkg" ]; then
+    echo "Package found"
     teamID=$(spctl -a -vv -t install "$archiveName" 2>&1 | awk '/origin=/ {print $NF }' | tr -d '()' )
+    echo "For PKGs it's advised to find packageID for version checking"
+    pkgutil --expand "$archiveName" "$archiveName"_pkg
+    cat "$archiveName"_pkg/Distribution | xpath '//installer-gui-script/pkg-ref[@id][@version]' 2>/dev/null
+    packageID="$(cat "$archiveName"_pkg/Distribution | xpath '//installer-gui-script/pkg-ref[@id][@version]' 2>/dev/null | tr ' ' '\n' | grep -i "id" | cut -d \" -f 2)"
+    rm -r "$archiveName"_pkg
+    echo "$packageID"
+    echo "Above is the possible packageIDs that can be used, and the correct one is probably one of those with a version number. More investigation might be needed to figure out correct packageID if several are displayed."
 elif [ "$archiveExt" = "dmg" ]; then
+    echo "Diskimage found"
     # mount the dmg
     echo "Mounting $archiveName"
     if ! dmgmount=$(echo "Y"$'\n' | hdiutil attach "$archiveName" -nobrowse -readonly | tail -n 1 | cut -c 54- ); then
@@ -55,6 +80,7 @@ elif [ "$archiveExt" = "dmg" ]; then
     
     hdiutil detach "$dmgmount"
 elif [ "$archiveExt" = "zip" ] || [ "$archiveExt" = "tbz" ]; then
+    echo "Compressed file found"
     # unzip the archive
     tar -xf "$archiveName"
     
@@ -71,20 +97,26 @@ elif [ "$archiveExt" = "zip" ] || [ "$archiveExt" = "tbz" ]; then
 fi
 
 echo
-echo "    $identifier)"
-echo "        name=\"$name\""
-echo "        type=\"$archiveExt\""
-echo "        downloadURL=\"$downloadURL\""
-echo "        expectedTeamID=\"$teamID\""
-if [ -n "$appName" ] && [ "$appName" != "${name}.app" ]; then
-echo "        appName=\"$appName\""
+echo "appNewVersion is often difficult to find. Can sometimes be found in the filename, but also on a web page."
+echo
+echo "$identifier)"
+echo "    name=\"$name\""
+echo "    type=\"$archiveExt\""
+if [ "$packageID" != "" ]; then
+echo "    packageID=\"$packageID\""
 fi
-echo "        ;;"
-echo 
+echo "    downloadURL=\"$downloadURL\""
+echo "    appNewVersion=\"\""
+echo "    expectedTeamID=\"$teamID\""
+if [ -n "$appName" ] && [ "$appName" != "${name}.app" ]; then
+echo "    appName=\"$appName\""
+fi
+echo "    ;;"
+echo
 
 #if [ -e "${tmpDir}" ]; then
 #    #echo "deleting tmp dir"
 #    rm -rf "${tmpDir}"
 #fi
 
-exit 0
\ No newline at end of file
+exit 0