Merge pull request #658 from Theile/Dialog-additions

Dialog update when app is already at the latest version
This commit is contained in:
Søren Theilgaard
2022-09-30 21:30:34 +02:00
committed by GitHub
2 changed files with 16 additions and 0 deletions

View File

@@ -285,6 +285,10 @@ getAppVersion() {
printlog "Replacing App Store apps, no matter the version" WARN printlog "Replacing App Store apps, no matter the version" WARN
appversion=0 appversion=0
else else
if [[ $DIALOG_CMD_FILE != "" ]]; then
updateDialog "wait" "Already installed from App Store. Not replaced."
sleep 4
fi
cleanupAndExit 23 "App previously installed from App Store, and we respect that" ERROR cleanupAndExit 23 "App previously installed from App Store, and we respect that" ERROR
fi fi
fi fi
@@ -462,6 +466,10 @@ installAppWithPath() { # $1: path to app to install in $targetDir
printlog "notifying" printlog "notifying"
displaynotification "$message" "No update for $name!" displaynotification "$message" "No update for $name!"
fi fi
if [[ $DIALOG_CMD_FILE != "" ]]; then
updateDialog "wait" "Latest version already installed..."
sleep 2
fi
cleanupAndExit 0 "No new version to install" REG cleanupAndExit 0 "No new version to install" REG
else else
printlog "Using force to install anyway." printlog "Using force to install anyway."
@@ -628,6 +636,10 @@ installFromPKG() {
printlog "notifying" printlog "notifying"
displaynotification "$message" "No update for $name!" displaynotification "$message" "No update for $name!"
fi fi
if [[ $DIALOG_CMD_FILE != "" ]]; then
updateDialog "wait" "Latest version already installed..."
sleep 2
fi
cleanupAndExit 0 "No new version to install" REQ cleanupAndExit 0 "No new version to install" REQ
else else
printlog "Using force to install anyway." printlog "Using force to install anyway."

View File

@@ -183,6 +183,10 @@ if [[ -n $appNewVersion ]]; then
printlog "notifying" printlog "notifying"
displaynotification "$message" "No update for $name!" displaynotification "$message" "No update for $name!"
fi fi
if [[ $DIALOG_CMD_FILE != "" ]]; then
updateDialog "complete" "Latest version already installed..."
sleep 2
fi
cleanupAndExit 0 "No newer version." REQ cleanupAndExit 0 "No newer version." REQ
fi fi
else else