From d8e701052c0d9e359920ad56c8b0d122d4e2dfdf Mon Sep 17 00:00:00 2001 From: Alexandre <44178713+alexbelgium@users.noreply.github.com> Date: Sat, 2 Aug 2025 14:35:49 +0200 Subject: [PATCH] fix: use default branch in updater --- addons_updater/rootfs/etc/cont-init.d/99-run.sh | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/addons_updater/rootfs/etc/cont-init.d/99-run.sh b/addons_updater/rootfs/etc/cont-init.d/99-run.sh index af4d7891e..5afe031c4 100755 --- a/addons_updater/rootfs/etc/cont-init.d/99-run.sh +++ b/addons_updater/rootfs/etc/cont-init.d/99-run.sh @@ -12,7 +12,7 @@ if bashio::config.true "dry_run"; then bashio::log.warning "Dry run mode : on" fi -bashio::log.info "Checking status of referenced repositoriess..." +bashio::log.info "Checking status of referenced repositories..." VERBOSE=$(bashio::config 'verbose') #Defining github value @@ -42,7 +42,8 @@ if [ ! -d "/data/$BASENAME" ]; then else LOGINFO="... updating ${REPOSITORY}" && if [ "$VERBOSE" = true ]; then bashio::log.info "$LOGINFO"; fi cd "/data/$BASENAME" || exit - git pull --rebase origin > /dev/null || git reset --hard origin/master > /dev/null + DEFAULT_BRANCH=$(git remote show origin | sed -n '/HEAD branch/s/.*: //p') + git pull --rebase origin > /dev/null || git reset --hard "origin/${DEFAULT_BRANCH}" > /dev/null git pull --rebase origin > /dev/null || (rm -r "/data/$BASENAME" && git clone "https://github.com/${REPOSITORY}") fi