From 4b966869e0fcc366181a90b1b02515512932f8f8 Mon Sep 17 00:00:00 2001 From: Jookia Date: Sun, 16 Apr 2023 11:32:43 +1000 Subject: [PATCH] fix(klipper): Check for updates on custom branch If a custom Klipper repository is not using 'master' as the branch checking for updates will fail or give stale data. Fix this by checking the custom branch instead. --- scripts/klipper.sh | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/scripts/klipper.sh b/scripts/klipper.sh index 27483cb..66126b4 100644 --- a/scripts/klipper.sh +++ b/scripts/klipper.sh @@ -590,8 +590,14 @@ function get_remote_klipper_commit() { [[ ! -d ${KLIPPER_DIR} || ! -d "${KLIPPER_DIR}/.git" ]] && return local commit + local branch + + read_kiauh_ini "${FUNCNAME[0]}" + branch="${custom_klipper_repo_branch}" + [[ -z ${branch} ]] && branch="master" + cd "${KLIPPER_DIR}" && git fetch origin -q - commit=$(git describe origin/master --always --tags | cut -d "-" -f 1,2) + commit=$(git describe "origin/${branch}" --always --tags | cut -d "-" -f 1,2) echo "${commit}" }