From 2589d2ec389189f2e55998b4606d6ea8fa90fe32 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?S=C3=B8ren=20Theilgaard?= Date: Tue, 26 Apr 2022 21:53:57 +0200 Subject: [PATCH] Update to duckduckgo as appcast was changed MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit The appcast url now has the newest version at the top. I guess we should sort the list if the newest will be moved again. Now this result: ``` ➜ Installomator/utils/assemble.sh duckduckgo DEBUG=0 2022-04-26 21:51:22 : WARN : duckduckgo : setting variable from argument DEBUG=0 2022-04-26 21:51:22 : REQ : duckduckgo : ################## Start Installomator v. 10dev, date 2022-04-26 2022-04-26 21:51:22 : INFO : duckduckgo : ################## Version: 10dev 2022-04-26 21:51:22 : INFO : duckduckgo : ################## Date: 2022-04-26 2022-04-26 21:51:22 : INFO : duckduckgo : ################## duckduckgo 2022-04-26 21:51:22 : INFO : duckduckgo : BLOCKING_PROCESS_ACTION=tell_user 2022-04-26 21:51:22 : INFO : duckduckgo : NOTIFY=success 2022-04-26 21:51:22 : INFO : duckduckgo : LOGGING=INFO 2022-04-26 21:51:22 : INFO : duckduckgo : LOGO=/System/Applications/App Store.app/Contents/Resources/AppIcon.icns 2022-04-26 21:51:22 : INFO : duckduckgo : Label type: dmg 2022-04-26 21:51:22 : INFO : duckduckgo : archiveName: DuckDuckGo.dmg 2022-04-26 21:51:22 : INFO : duckduckgo : no blocking processes defined, using DuckDuckGo as default 2022-04-26 21:51:22 : INFO : duckduckgo : App(s) found: /Applications/DuckDuckGo.app 2022-04-26 21:51:22 : INFO : duckduckgo : found app at /Applications/DuckDuckGo.app, version 0.22.3, on versionKey CFBundleShortVersionString 2022-04-26 21:51:22 : INFO : duckduckgo : appversion: 0.22.3 2022-04-26 21:51:22 : INFO : duckduckgo : Latest version of DuckDuckGo is 0.23.0 2022-04-26 21:51:22 : REQ : duckduckgo : Downloading https://staticcdn.duckduckgo.com/macos-desktop-browser/duckduckgo-0.23.0.dmg to DuckDuckGo.dmg 2022-04-26 21:51:24 : REQ : duckduckgo : no more blocking processes, continue with update 2022-04-26 21:51:24 : REQ : duckduckgo : Installing DuckDuckGo 2022-04-26 21:51:24 : INFO : duckduckgo : Mounting /var/folders/zz/zyxvpxvq6csfxvn_n0000000000000/T/tmp.lQwUqkMi/DuckDuckGo.dmg 2022-04-26 21:51:28 : INFO : duckduckgo : Mounted: /Volumes/DuckDuckGo 2022-04-26 21:51:28 : INFO : duckduckgo : Verifying: /Volumes/DuckDuckGo/DuckDuckGo.app 2022-04-26 21:51:29 : INFO : duckduckgo : Team ID matching: HKE973VLUW (expected: HKE973VLUW ) 2022-04-26 21:51:29 : INFO : duckduckgo : Downloaded version of DuckDuckGo is 0.23.0 on versionKey CFBundleShortVersionString (replacing version 0.22.3). 2022-04-26 21:51:29 : INFO : duckduckgo : App has LSMinimumSystemVersion: 10.15 2022-04-26 21:51:29 : WARN : duckduckgo : Removing existing /Applications/DuckDuckGo.app 2022-04-26 21:51:29 : INFO : duckduckgo : Copy /Volumes/DuckDuckGo/DuckDuckGo.app to /Applications 2022-04-26 21:51:29 : WARN : duckduckgo : Changing owner to st 2022-04-26 21:51:29 : INFO : duckduckgo : Finishing... 2022-04-26 21:51:39 : INFO : duckduckgo : App(s) found: /Applications/DuckDuckGo.app 2022-04-26 21:51:39 : INFO : duckduckgo : found app at /Applications/DuckDuckGo.app, version 0.23.0, on versionKey CFBundleShortVersionString 2022-04-26 21:51:39 : REQ : duckduckgo : Installed DuckDuckGo, version 0.23.0 2022-04-26 21:51:39 : INFO : duckduckgo : notifying 2022-04-26 21:51:40 : INFO : duckduckgo : App not closed, so no reopen. 2022-04-26 21:51:40 : REQ : duckduckgo : All done! 2022-04-26 21:51:40 : REQ : duckduckgo : ################## End Installomator, exit code 0 ``` --- fragments/labels/duckduckgo.sh | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/fragments/labels/duckduckgo.sh b/fragments/labels/duckduckgo.sh index bbac890..a5cb4e0 100644 --- a/fragments/labels/duckduckgo.sh +++ b/fragments/labels/duckduckgo.sh @@ -2,7 +2,9 @@ duckduckgo) name="DuckDuckGo" type="dmg" #downloadURL="https://staticcdn.duckduckgo.com/macos-desktop-browser/duckduckgo.dmg" - downloadURL=$(curl -fs https://staticcdn.duckduckgo.com/macos-desktop-browser/appcast.xml | xpath '(//rss/channel/item/enclosure/@url)[last()]' 2>/dev/null | cut -d '"' -f2) - appNewVersion=$(curl -fs https://staticcdn.duckduckgo.com/macos-desktop-browser/appcast.xml | xpath '(//rss/channel/item/enclosure/@sparkle:version)[last()]' 2>/dev/null | cut -d '"' -f2) + #downloadURL=$(curl -fs https://staticcdn.duckduckgo.com/macos-desktop-browser/appcast.xml | xpath '(//rss/channel/item/enclosure/@url)[last()]' 2>/dev/null | cut -d '"' -f2) + downloadURL=$(curl -fs https://staticcdn.duckduckgo.com/macos-desktop-browser/appcast.xml | xpath '(//rss/channel/item/enclosure/@url)[1]' 2>/dev/null | cut -d '"' -f2) + #appNewVersion=$(curl -fs https://staticcdn.duckduckgo.com/macos-desktop-browser/appcast.xml | xpath '(//rss/channel/item/enclosure/@sparkle:version)[last()]' 2>/dev/null | cut -d '"' -f2) + appNewVersion=$(curl -fs https://staticcdn.duckduckgo.com/macos-desktop-browser/appcast.xml | xpath '(//rss/channel/item/sparkle:shortVersionString)[1]' 2>/dev/null | cut -d ">" -f2 | cut -d "<" -f1) expectedTeamID="HKE973VLUW" ;;