canva label

Improvements to the `buildLabel.sh` script. It can try better to download the software and might show better headers for versioning.
```
sudo /Users/st/Documents/GitHub/Installomator/utils/assemble.sh -r canva DEBUG=0 NOTIFY=all
Password:
2021-11-02 20:19:20 canva setting variable from argument DEBUG=0
2021-11-02 20:19:20 canva setting variable from argument NOTIFY=all
2021-11-02 20:19:20 canva ################## Start Installomator v. 0.8.0
2021-11-02 20:19:20 canva ################## canva
2021-11-02 20:19:21 canva BLOCKING_PROCESS_ACTION=tell_user
2021-11-02 20:19:21 canva NOTIFY=all
2021-11-02 20:19:21 canva LOGO=/System/Applications/App Store.app/Contents/Resources/AppIcon.icns
2021-11-02 20:19:21 canva no blocking processes defined, using Canva as default
2021-11-02 20:19:21 canva Changing directory to /var/folders/zz/zyxvpxvq6csfxvn_n0000000000000/T/tmp.YfHnGeSB
2021-11-02 20:19:21 canva App(s) found:
2021-11-02 20:19:21 canva could not find Canva.app
2021-11-02 20:19:21 canva appversion:
2021-11-02 20:19:21 canva Latest version of Canva is 1.34
2021-11-02 20:19:21 canva Downloading https://desktop-release.canva.com/Canva-1.34.0-arm64.dmg to Canva.dmg
2021-11-02 20:19:21 canva notifying
2021-11-02 20:19:29 canva no more blocking processes, continue with update
2021-11-02 20:19:29 canva Installing Canva
2021-11-02 20:19:29 canva notifying
2021-11-02 20:19:29 canva Mounting /var/folders/zz/zyxvpxvq6csfxvn_n0000000000000/T/tmp.YfHnGeSB/Canva.dmg
2021-11-02 20:19:32 canva Mounted: /Volumes/Canva 1.34.0-arm64
2021-11-02 20:19:32 canva Verifying: /Volumes/Canva 1.34.0-arm64/Canva.app
2021-11-02 20:19:33 canva Team ID matching: 5HD2ARTBFS (expected: 5HD2ARTBFS )
2021-11-02 20:19:33 canva Downloaded version of Canva is 1.34.0 (replacing version ).
2021-11-02 20:19:33 canva Copy /Volumes/Canva 1.34.0-arm64/Canva.app to /Applications
2021-11-02 20:19:34 canva Changing owner to st
2021-11-02 20:19:34 canva Finishing…
2021-11-02 20:19:44 canva App(s) found: /Applications/Canva.app
2021-11-02 20:19:44 canva found app at /Applications/Canva.app, version 1.34.0
2021-11-02 20:19:44 canva Installed Canva, version 1.34.0
2021-11-02 20:19:44 canva notifying
2021-11-02 20:19:45 canva Deleting /var/folders/zz/zyxvpxvq6csfxvn_n0000000000000/T/tmp.YfHnGeSB
2021-11-02 20:19:45 canva Unmounting /Volumes/Canva 1.34.0-arm64
"disk4" ejected.
2021-11-02 20:19:45 canva App not closed, so no reopen.
2021-11-02 20:19:45 canva ################## End Installomator, exit code 0
```
This commit is contained in:
Søren Theilgaard
2021-11-02 21:27:53 +01:00
parent b017b7bae9
commit 32c3dff48d
3 changed files with 32 additions and 3 deletions

View File

@@ -25,10 +25,27 @@ echo "Working dir: $(pwd)"
# download the URL
echo "Downloading $downloadURL"
echo "Redirecting to (maybe this can help us with version):\n$(curl -fsIL "$downloadURL" | grep -i ^location)"
echo $(basename $downloadURL)
#exit
echo "Redirecting to (maybe this can help us with version):\n$(curl -fsIL -H "User-Agent: Mozilla/5.0 (Macintosh; Intel Mac OS X 10_15_7) AppleWebKit/605.1.15 (KHTML, like Gecko) Version/15.1 Safari/605.1.15" -H "accept-encoding: gzip, deflate, br" -H "Referrer Policy: strict-origin-when-cross-origin" -H "upgrade-insecure-requests: 1" -H "sec-fetch-dest: document" -H "sec-gpc: 1" -H "sec-fetch-user: ?1" -H "accept-language: en-US,en;q=0.9" -H "accept: text/html,application/xhtml+xml,application/xml;q=0.9,image/avif,image/webp,image/apng,*/*;q=0.8,application/signed-exchange;v=b3;q=0.9" -H "sec-fetch-mode: navigate" "$downloadURL" | grep -i "^[location|x\-amz\-meta\-version]*")"
if ! downloadOut="$(curl -fL "$downloadURL" --remote-header-name --remote-name -w "%{filename_effective}\n%{url_effective}\n")"; then
echo "error downloading $downloadURL"
exit 2
echo "error downloading $downloadURL using standard headers."
echo "result: $downloadOut"
echo "Trying all headers…"
if ! downloadOut="$(curl -fL -H "User-Agent: Mozilla/5.0 (Macintosh; Intel Mac OS X 10_15_7) AppleWebKit/605.1.15 (KHTML, like Gecko) Version/15.1 Safari/605.1.15" -H "accept-encoding: gzip, deflate, br" -H "Referrer Policy: strict-origin-when-cross-origin" -H "upgrade-insecure-requests: 1" -H "sec-fetch-dest: document" -H "sec-gpc: 1" -H "sec-fetch-user: ?1" -H "accept-language: en-US,en;q=0.9" -H "accept: text/html,application/xhtml+xml,application/xml;q=0.9,image/avif,image/webp,image/apng,*/*;q=0.8,application/signed-exchange;v=b3;q=0.9" -H "sec-fetch-mode: navigate" "$downloadURL" --remote-header-name --remote-name -w "%{filename_effective}\n%{url_effective}\n")"; then
echo "error downloading $downloadURL using all headers."
echo "result: $downloadOut"
if [[ -n $downloadOut ]]; then
echo "Trying output of this…"
downloadURL="$(echo $downloadOut | tail -1)"
if ! downloadOut="$(curl -fL "$downloadURL" --remote-header-name --remote-name -w "%{filename_effective}\n%{url_effective}\n")"; then
echo "error downloading $downloadURL using previous output."
echo "result: $downloadOut"
echo "No more tries. Cannot continue."
exit 1
fi
fi
fi
fi
xpath() {