Merge pull request #1984 from GhostWriters/Updates

Add `ds --version <branch>` and adjust display of version text during `ds -u`

Author: CLHatch

.scripts/update_self.sh

@@ -3,11 +3,11 @@ set -Eeuo pipefail
 IFS=$'\n\t'
 
 update_self() {
-    local BRANCH CurrentBranch
+    local BRANCH CurrentBranch CurrentVersion RemoteVersion
     BRANCH=${1-}
     pushd "${SCRIPTPATH}" &> /dev/null || fatal "Failed to change directory.\nFailing command: ${F[C]}push \"${SCRIPTPATH}\""
     CurrentBranch="$(git branch --show)"
-    popd &> /dev/null
+    CurrentVersion="$(ds_version)"
 
     local Title="Update ${APPLICATION_NAME}"
     local Question YesNotice NoNotice
@@ -16,17 +16,35 @@ update_self() {
             error "You need to specify a branch to update to."
             return 1
         fi
-        Question="Would you like to update ${APPLICATION_NAME} to current branch ${CurrentBranch} now?"
+        RemoteVersion="$(ds_version "${CurrentBranch}")"
+        Question="Would you like to update ${APPLICATION_NAME} from ${CurrentVersion} to ${RemoteVersion} now?"
         NoNotice="${APPLICATION_NAME} will not be updated."
-        YesNotice="Updating ${APPLICATION_NAME} to branch ${CurrentBranch}."
+        YesNotice="Updating ${APPLICATION_NAME} from ${CurrentVersion} to ${RemoteVersion}."
     elif [[ ${BRANCH-} == "${CurrentBranch-}" ]]; then
-        Question="Would you like to forcefully update ${APPLICATION_NAME} to current branch ${BRANCH} now?"
-        NoNotice="${APPLICATION_NAME} will not be updated."
-        YesNotice="Updating ${APPLICATION_NAME} to branch ${BRANCH}."
+        RemoteVersion="$(ds_version "${CurrentBranch}")"
+        if [[ ${CurrentVersion} == "${RemoteVersion}" ]]; then
+            Question="Would you like to forcefully re-apply ${APPLICATION_NAME} update ${CurrentVersion}?"
+            NoNotice="${APPLICATION_NAME} will not be updated."
+            YesNotice="Updating ${APPLICATION_NAME} to ${RemoteVersion}."
+        fi
     else
-        Question="Would you like to update ${APPLICATION_NAME} from branch ${CurrentBranch} to ${BRANCH} now?"
-        NoNotice="${APPLICATION_NAME} will not be updated from branch ${CurrentBranch} to ${BRANCH}."
-        YesNotice="Updating ${APPLICATION_NAME} from branch ${CurrentBranch} to ${BRANCH}."
+        RemoteVersion="$(ds_version "${BRANCH}")"
+        Question="Would you like to update ${APPLICATION_NAME} from ${CurrentVersion} to ${RemoteVersion} now?"
+        NoNotice="${APPLICATION_NAME} will not be updated from ${CurrentVersion} to ${RemoteVersion}."
+        YesNotice="Updating ${APPLICATION_NAME} from ${CurrentVersion} to ${RemoteVersion}."
+    fi
+    popd &> /dev/null
+    if [[ -z ${BRANCH-} && ${CurrentVersion} == "${RemoteVersion}" ]]; then
+        if use_dialog_box; then
+            {
+                notice "${APPLICATION_NAME} is already up to date on branch ${BRANCH}."
+                notice "Current version is ${CurrentVersion}"
+            } |& dialog_pipe "${DC[TitleWarning]}${Title}" "${DC[CommandLine]} ds --update $*"
+        else
+            notice "${APPLICATION_NAME} is already up to date on branch ${CurrentBranch}."
+            notice "Current version is ${CurrentVersion}"
+        fi
+        return
     fi
     if ! run_script 'question_prompt' Y "${Question}" "${Title}" "${FORCE:+Y}"; then
         if use_dialog_box; then
@@ -48,17 +66,8 @@ update_self() {
 commands_update_self() {
     local BRANCH=${1-}
     local Notice=${2-}
-    local CurrentBranch
 
     pushd "${SCRIPTPATH}" &> /dev/null || fatal "Failed to change directory.\nFailing command: ${F[C]}push \"${SCRIPTPATH}\""
-    if [[ -z ${BRANCH-} ]]; then
-        BRANCH="$(git branch --show)"
-        if ! ds_update_available; then
-            notice "${APPLICATION_NAME} is already up to date on branch ${BRANCH}."
-            notice "Current version is $(ds_version)"
-            return
-        fi
-    fi
     local QUIET=''
     if [[ -z ${VERBOSE-} ]]; then
         QUIET='--quiet'
@@ -93,7 +102,7 @@ commands_update_self() {
     git ls-tree -rt --name-only "${BRANCH}" | xargs sudo chown "${DETECTED_PUID}":"${DETECTED_PGID}" > /dev/null 2>&1 || true
     sudo chown -R "${DETECTED_PUID}":"${DETECTED_PGID}" "${SCRIPTPATH}/.git" > /dev/null 2>&1 || true
     sudo chown "${DETECTED_PUID}":"${DETECTED_PGID}" "${SCRIPTPATH}" > /dev/null 2>&1 || true
-    notice "Updated to $(ds_version)"
+    notice "Updated to [$(ds_version)]"
     popd &> /dev/null
     exec bash "${SCRIPTNAME}" -e
 }

main.sh

@@ -118,17 +118,32 @@ run_script() {
     fi
 }
 
-ds_version() {
-    local Branch Version
+ds_branch() {
     pushd "${SCRIPTPATH}" &> /dev/null || fatal "Failed to change directory.\nFailing command: ${F[C]}pushd \"${SCRIPTPATH}\""
     git fetch --quiet &> /dev/null || true
+    git branch --show
+    popd &> /dev/null
+}
+
+ds_version() {
+    local CheckBranch=${1-}
+    pushd "${SCRIPTPATH}" &> /dev/null || fatal "Failed to change directory.\nFailing command: ${F[C]}pushd \"${SCRIPTPATH}\""
+    git fetch --all --quiet &> /dev/null || true
 
     # Get the branch
-    Branch="$(git symbolic-ref --short -q HEAD 2> /dev/null || true)"
+    local commitish Branch
+    if [[ -n ${CheckBranch-} ]]; then
+        commitish="origin/${CheckBranch}"
+        Branch="${CheckBranch}"
+    else
+        commitish='HEAD'
+        Branch="$(ds_branch)"
+    fi
     # Get the current tag. If no tag, use the commit instead.
-    Version="$(git describe --tags --exact-match 2> /dev/null || true)"
+    local Version
+    Version="$(git describe --tags --exact-match "${commitish}" 2> /dev/null || true)"
     if [[ -z ${Version-} ]]; then
-        Version="commit $(git rev-parse --short HEAD 2> /dev/null || true)"
+        Version="commit $(git rev-parse --short "${commitish}" 2> /dev/null || true)"
     fi
 
     echo "${Branch-} ${Version-}"
@@ -535,7 +550,11 @@ cmdline() {
                 readonly VERBOSE=1
                 ;;
             V | version)
-                readonly VERSION=1
+                VERSION=''
+                if [[ -n ${OPTARG-} && ${OPTARG:0:1} != '-' ]]; then
+                    VERSION="${OPTARG}"
+                fi
+                readonly VERSION
                 ;;
             x | debug)
                 readonly DEBUG=1
@@ -844,7 +863,7 @@ main() {
     # Apply the GUI theme
     if ds_update_available; then
         notice "${APPLICATION_NAME} [${APPLICATION_VERSION}]"
-        notice "An update to ${APPLICATION_NAME} is available. Run 'ds -u' to update."
+        notice "An update to ${APPLICATION_NAME} is available. Run 'ds -u' to update to version $(ds_version "$(ds_branch)")."
     else
         info "${APPLICATION_NAME} [${APPLICATION_VERSION}]"
     fi
@@ -1205,8 +1224,8 @@ main() {
         fi
         exit
     fi
-    if [[ -n ${VERSION-} ]]; then
-        echo "${APPLICATION_NAME} [${APPLICATION_VERSION}]"
+    if [[ -v VERSION ]]; then
+        echo "${APPLICATION_NAME} [$(ds_version "${VERSION}")]"
         exit
     fi
     # Run Menus