mtan93/Installomator
1
0
Fork 0
mirror of https://github.com/mtan93/Installomator.git synced 2026-03-30 22:04:17 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'versionKey-improvements' into 2022-02-02_Theile-base

Browse Source
This commit is contained in:
Søren Theilgaard
2022-02-02 14:34:01 +01:00
parent f53e20e313 49337a4ae8
commit 168abdb32e
2 changed files with 6 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
fragments/arguments.sh
View File

@@ -52,8 +52,9 @@ if [[ $DEBUG -gt 0 ]]; then
fi fi
# How we get version number from app # How we get version number from app
# (alternative is "CFBundleVersion", that can be used in labels) if [[ -z $versionKey ]]; then
versionKey="CFBundleShortVersionString" versionKey="CFBundleShortVersionString"
fi
# get current user # get current user
currentUser=$(scutil <<< "show State:/Users/ConsoleUser" | awk '/Name :/ { print $3 }') currentUser=$(scutil <<< "show State:/Users/ConsoleUser" | awk '/Name :/ { print $3 }')

6
fragments/functions.sh
View File

@@ -182,7 +182,7 @@ getAppVersion() {
installedAppPath=$filteredAppPaths[1] installedAppPath=$filteredAppPaths[1]
#appversion=$(mdls -name kMDItemVersion -raw $installedAppPath ) #appversion=$(mdls -name kMDItemVersion -raw $installedAppPath )
appversion=$(defaults read $installedAppPath/Contents/Info.plist $versionKey) #Not dependant on Spotlight indexing appversion=$(defaults read $installedAppPath/Contents/Info.plist $versionKey) #Not dependant on Spotlight indexing
printlog "found app at $installedAppPath, version $appversion" printlog "found app at $installedAppPath, version $appversion, on versionKey $versionKey"
updateDetected="YES" updateDetected="YES"
# Is current app from App Store # Is current app from App Store
if [[ -d "$installedAppPath"/Contents/_MASReceipt ]];then if [[ -d "$installedAppPath"/Contents/_MASReceipt ]];then
@@ -353,7 +353,7 @@ installAppWithPath() { # $1: path to app to install in $targetDir
# app versioncheck # app versioncheck
appNewVersion=$(defaults read $appPath/Contents/Info.plist $versionKey) appNewVersion=$(defaults read $appPath/Contents/Info.plist $versionKey)
if [[ -n $appNewVersion && $appversion == $appNewVersion ]]; then if [[ -n $appNewVersion && $appversion == $appNewVersion ]]; then
printlog "Downloaded version of $name is $appNewVersion, same as installed." printlog "Downloaded version of $name is $appNewVersion on versionKey $versionKey, same as installed."
if [[ $INSTALL != "force" ]]; then if [[ $INSTALL != "force" ]]; then
message="$name, version $appNewVersion, is the latest version." message="$name, version $appNewVersion, is the latest version."
if [[ $currentUser != "loginwindow" && $NOTIFY == "all" ]]; then if [[ $currentUser != "loginwindow" && $NOTIFY == "all" ]]; then
@@ -365,7 +365,7 @@ installAppWithPath() { # $1: path to app to install in $targetDir
printlog "Using force to install anyway." printlog "Using force to install anyway."
fi fi
else else
printlog "Downloaded version of $name is $appNewVersion (replacing version $appversion)." printlog "Downloaded version of $name is $appNewVersion on versionKey $versionKey (replacing version $appversion)."
fi fi
# macOS versioncheck # macOS versioncheck