mtan93/Installomator
1
0
Fork 0
mirror of https://github.com/mtan93/Installomator.git synced 2026-03-08 21:02:46 +00:00
Code Issues Packages Projects Releases Wiki Activity

appCustomVersion(){}

Browse Source 
This can be used in a label now.
This commit is contained in:
Søren Theilgaard
2021-05-12 11:17:07 +02:00
parent 932013b34b
commit e64fe9fcda
1 changed files with 24 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

33
Installomator.sh
View File

@@ -118,7 +118,13 @@ REOPEN="yes"
# How we get version number from app. Possible values: # How we get version number from app. Possible values:
# - CFBundleShortVersionString # - CFBundleShortVersionString
# - CFBundleVersion # - CFBundleVersion
# Not all software titles uses fields the same. Opera uses the latter. # Not all software titles uses fields the same.
# See Opera label.
#
# - appCustomVersion(){}: (optional function)
# This function can be added to your label, if a specific custom
# mechanism hs to be used for getting the installed version.
# See labels zulujdk11, zulujdk13, zulujdk15
# #
# - expectedTeamID: (required) # - expectedTeamID: (required)
# 10-digit developer team ID. # 10-digit developer team ID.
@@ -310,7 +316,15 @@ xpath() {
getAppVersion() { getAppVersion() {
# modified by: Søren Theilgaard (@theilgaard) # modified by: Søren Theilgaard (@theilgaard) and Isaac Ordonez
# If label contain function appCustomVersion, we use that and return
if type 'appCustomVersion' 2>/dev/null | grep -q 'function'; then
appversion=$(appCustomVersion)
printlog "Custom App Version detection is used, found $appversion"
return
fi
# pkgs contains a version number, then we don't have to search for an app # pkgs contains a version number, then we don't have to search for an app
if [[ $packageID != "" ]]; then if [[ $packageID != "" ]]; then
appversion="$(pkgutil --pkg-info-plist ${packageID} 2>/dev/null | grep -A 1 pkg-version | tail -1 | sed -E 's/.*>([0-9.]*)<.*/\1/g')" appversion="$(pkgutil --pkg-info-plist ${packageID} 2>/dev/null | grep -A 1 pkg-version | tail -1 | sed -E 's/.*>([0-9.]*)<.*/\1/g')"
@@ -1586,6 +1600,7 @@ installomator_st)
packageID="dk.theilgaard.pkg.Installomator" packageID="dk.theilgaard.pkg.Installomator"
downloadURL=$(downloadURLFromGit theile Installomator ) downloadURL=$(downloadURLFromGit theile Installomator )
appNewVersion=$(versionFromGit theile Installomator ) appNewVersion=$(versionFromGit theile Installomator )
#appCustomVersion(){/usr/local/bin/Installomator.sh version | tail -1 | awk '{print $4}'}
expectedTeamID="L8W73B6AH3" expectedTeamID="L8W73B6AH3"
blockingProcesses=( NONE ) blockingProcesses=( NONE )
;; ;;
@@ -2625,7 +2640,7 @@ wireshark)
name="Wireshark" name="Wireshark"
type="dmg" type="dmg"
downloadURL="https://1.as.dl.wireshark.org/osx/Wireshark%20Latest%20Intel%2064.dmg" downloadURL="https://1.as.dl.wireshark.org/osx/Wireshark%20Latest%20Intel%2064.dmg"
appNewVersion=$(curl -fs https://www.wireshark.org/download.html | grep "Stable Release" | grep -o "(.*.)" | cut -f2 | head -1 | awk -F'[()]' '{print $2}') appNewVersion=$(curl -fs https://www.wireshark.org/download.html | grep "Stable Release" | grep -o "(.*.)" | cut -f2 | head -1 | awk -F '[()]' '{print $2}')
expectedTeamID="7Z6EMTD2C6" expectedTeamID="7Z6EMTD2C6"
;; ;;
xink) xink)
@@ -2690,8 +2705,8 @@ zulujdk11)
downloadURL=$(curl -fs "https://www.azul.com/downloads/zulu-community/" | xmllint --html --format - 2>/dev/null | tr , '\n' | grep -o "https:.*/zulu11.*ca-jdk11.*aarch64.dmg" | sed 's/\\//g') downloadURL=$(curl -fs "https://www.azul.com/downloads/zulu-community/" | xmllint --html --format - 2>/dev/null | tr , '\n' | grep -o "https:.*/zulu11.*ca-jdk11.*aarch64.dmg" | sed 's/\\//g')
fi fi
expectedTeamID="TDTHCUPYFR" expectedTeamID="TDTHCUPYFR"
#appCustomVersion(){ java -version 2>&1 | grep Runtime | awk '{print $4}' | sed -e "s/.*Zulu//" | cut -d '-' -f 1 | sed -e "s/+/\./" } appCustomVersion(){ java -version 2>&1 | grep Runtime | awk '{print $4}' | sed -e "s/.*Zulu//" | cut -d '-' -f 1 | sed -e "s/+/\./" }
#appNewVersion=$(echo "$downloadURL" | cut -d "-" -f 1 | sed -e "s/.*zulu//") # Cannot be compared to anything appNewVersion=$(echo "$downloadURL" | cut -d "-" -f 1 | sed -e "s/.*zulu//") # Cannot be compared to anything
#Company="Azul" #Company="Azul"
#PatchSkip="YES" #PatchSkip="YES"
;; ;;
@@ -2705,8 +2720,8 @@ zulujdk13)
downloadURL=$(curl -fs "https://www.azul.com/downloads/zulu-community/" | xmllint --html --format - 2>/dev/null | tr , '\n' | grep -o "https:.*/zulu13.*ca-jdk13.*aarch64.dmg" | sed 's/\\//g') downloadURL=$(curl -fs "https://www.azul.com/downloads/zulu-community/" | xmllint --html --format - 2>/dev/null | tr , '\n' | grep -o "https:.*/zulu13.*ca-jdk13.*aarch64.dmg" | sed 's/\\//g')
fi fi
expectedTeamID="TDTHCUPYFR" expectedTeamID="TDTHCUPYFR"
#appCustomVersion(){ java -version 2>&1 | grep Runtime | awk '{print $4}' | sed -e "s/.*Zulu//" | cut -d '-' -f 1 | sed -e "s/+/\./" } appCustomVersion(){ java -version 2>&1 | grep Runtime | awk '{print $4}' | sed -e "s/.*Zulu//" | cut -d '-' -f 1 | sed -e "s/+/\./" }
#appNewVersion=$(echo "$downloadURL" | cut -d "-" -f 1 | sed -e "s/.*zulu//") # Cannot be compared to anything appNewVersion=$(echo "$downloadURL" | cut -d "-" -f 1 | sed -e "s/.*zulu//") # Cannot be compared to anything
#Company="Azul" #Company="Azul"
#PatchSkip="YES" #PatchSkip="YES"
;; ;;
@@ -2720,8 +2735,8 @@ zulujdk15)
downloadURL=$(curl -fs "https://www.azul.com/downloads/zulu-community/" | xmllint --html --format - 2>/dev/null | tr , '\n' | grep -o "https:.*/zulu15.*ca-jdk15.*aarch64.dmg" | sed 's/\\//g') downloadURL=$(curl -fs "https://www.azul.com/downloads/zulu-community/" | xmllint --html --format - 2>/dev/null | tr , '\n' | grep -o "https:.*/zulu15.*ca-jdk15.*aarch64.dmg" | sed 's/\\//g')
fi fi
expectedTeamID="TDTHCUPYFR" expectedTeamID="TDTHCUPYFR"
#appCustomVersion(){ java -version 2>&1 | grep Runtime | awk '{print $4}' | sed -e "s/.*Zulu//" | cut -d '-' -f 1 | sed -e "s/+/\./" } appCustomVersion(){ java -version 2>&1 | grep Runtime | awk '{print $4}' | sed -e "s/.*Zulu//" | cut -d '-' -f 1 | sed -e "s/+/\./" }
#appNewVersion=$(echo "$downloadURL" | cut -d "-" -f 1 | sed -e "s/.*zulu//") # Cannot be compared to anything appNewVersion=$(echo "$downloadURL" | cut -d "-" -f 1 | sed -e "s/.*zulu//") # Cannot be compared to anything
#Company="Azul" #Company="Azul"
#PatchSkip="YES" #PatchSkip="YES"
;; ;;