diff --git a/hyakvnc b/hyakvnc index eb65086..d057c59 100755 --- a/hyakvnc +++ b/hyakvnc @@ -234,16 +234,15 @@ function hyakvnc_check_updates { local cur_branch cur_branch="$(git -C "${HYAKVNC_REPO_DIR}" branch --show-current 2>&1 || true)" - [[ -z "${cur_branch}" ]] && { + [[ -z "${cur_branch}" ]] && { log ERROR "Couldn't determine current branch. Can't pull updates." return 1 } [[ "${cur_branch}" != "main" ]] && { log WARN "Current branch is ${cur_branch}, not main. Be warned that this branch may not be up to date." - return 1 } - + local cur_date cur_date="$(git -C "${HYAKVNC_REPO_DIR}" show -s --format=%cd --date=human-local "${cur_branch}" || echo ???)" log INFO "The installed version was published ${cur_date}" @@ -1537,9 +1536,18 @@ EOF # cmd_update() function cmd_update { - hyakvnc_check_updates || return 1 - hyakvnc_pull_updates || return 1 - return 0 + log INFO "Checking for updates..." + if ! hyakvnc_check_updates; then + log INFO "No updates to apply." + else + log INFO "Applying updates..." + if ! hyakvnc_pull_updates; then + log WARN "No updates applied." + exit 1 + else + log INFO "Update complete." + fi + fi } # ## COMMAND: config