From 1c69595ddc80761786f9a72c13285722d0a76424 Mon Sep 17 00:00:00 2001 From: Maghuro <1546139+maghuro@users.noreply.github.com> Date: Wed, 23 Sep 2026 22:57:02 +0100 Subject: [PATCH] Fix stable branch references --- .github/workflows/Create-NewReleases.yml | 4 ++-- MerlinAU.sh | 14 +++++++------- README.md | 2 +- 3 files changed, 10 insertions(+), 10 deletions(-) diff --git a/.github/workflows/Create-NewReleases.yml b/.github/workflows/Create-NewReleases.yml index 5059e092..f488279f 100644 --- a/.github/workflows/Create-NewReleases.yml +++ b/.github/workflows/Create-NewReleases.yml @@ -63,7 +63,7 @@ jobs: run: | # Update the SCRIPT_VERSION and SCRIPT_BRANCH values in MerlinAU.sh sed -i "/^readonly SCRIPT_VERSION=/s/.*/readonly SCRIPT_VERSION=${{ steps.nextver.outputs.tag }}/" MerlinAU.sh - sed -i "/^SCRIPT_BRANCH=.*$/s/.*/SCRIPT_BRANCH=\"master\"/" MerlinAU.sh + sed -i "/^SCRIPT_BRANCH=.*$/s/.*/SCRIPT_BRANCH=\"main\"/" MerlinAU.sh - name: Stage Changes run: git add MerlinAU.sh @@ -71,7 +71,7 @@ jobs: - name: Commit Changes run: | if ! git diff --cached --quiet; then - git commit -m "Update SCRIPT_BRANCH to master in MerlinAU.sh and version to ${{ steps.nextver.outputs.tag }}" + git commit -m "Update SCRIPT_BRANCH to main in MerlinAU.sh and version to ${{ steps.nextver.outputs.tag }}" else echo "No changes to commit" fi diff --git a/MerlinAU.sh b/MerlinAU.sh index 7a17e739..aa2369a6 100644 --- a/MerlinAU.sh +++ b/MerlinAU.sh @@ -22,7 +22,7 @@ set -u readonly SCRIPT_VERSION=1.6.9 readonly SCRIPT_VERSTAG="26092216" readonly SCRIPT_NAME="MerlinAU" -## Set to "master" for Production Releases ## +## Set to "main" for Production Releases ## SCRIPT_BRANCH="dev" ##----------------------------------------## @@ -97,7 +97,7 @@ readonly ScriptFileName="${0##*/}" readonly ScriptFNameTag="${ScriptFileName%%.*}" readonly ScriptDirNameD="${ScriptFNameTag}.d" -if [ "$SCRIPT_BRANCH" = "master" ] +if [ "$SCRIPT_BRANCH" = "main" ] then readonly branchxStr_TAG="[Branch: $SCRIPT_BRANCH]" else readonly branchxStr_TAG="[Branch: development]" fi @@ -730,7 +730,7 @@ _ShowLogo_() else showBranchStr=false fi local spaceLen=58 colorCT - [ "$SCRIPT_BRANCH" = "master" ] && colorCT="$GRNct" || colorCT="$MGNTct" + [ "$SCRIPT_BRANCH" = "main" ] && colorCT="$GRNct" || colorCT="$MGNTct" echo printf "${YLWct}\n" printf " __ __ _ _ _ _ \n" @@ -809,7 +809,7 @@ Available commands: ${SCRIPT_NAME}.sh run_now run F/W update process ${SCRIPT_NAME}.sh processNodes run update check on nodes ${SCRIPT_NAME}.sh develop switch to development branch - ${SCRIPT_NAME}.sh stable switch to stable master branch + ${SCRIPT_NAME}.sh stable switch to stable main branch ${SCRIPT_NAME}.sh startup run startup initialization actions ${SCRIPT_NAME}.sh install install MerlinAU files ${SCRIPT_NAME}.sh uninstall uninstall MerlinAU files @@ -1189,7 +1189,7 @@ _ChangeToStable_() if ! _AcquireLock_ cliFileLock then return 1 fi - SCRIPT_BRANCH="master" + SCRIPT_BRANCH="main" SCRIPT_URL_REPO="${SCRIPT_URL_BASE}/$SCRIPT_BRANCH" _SCRIPT_UPDATE_ force _DoExit_ 0 @@ -11867,7 +11867,7 @@ _ShowMainMenuOptions_() fi clear - _ShowLogo_ "$([ "$SCRIPT_BRANCH" = "master" ] && echo false || echo true)" + _ShowLogo_ "$([ "$SCRIPT_BRANCH" = "main" ] && echo false || echo true)" printf "${YLWct}============ By ExtremeFiretop & Martinski W. ============${NOct}\n\n" # New Script Update Notification # @@ -12642,7 +12642,7 @@ _RunLockedInitializationChecks_() return "$retCode" } -if [ "$SCRIPT_BRANCH" = "master" ] +if [ "$SCRIPT_BRANCH" = "main" ] then SCRIPT_VERS_INFO="" else SCRIPT_VERS_INFO="[$versionDev_TAG]" fi diff --git a/README.md b/README.md index 516257e6..469b0ab2 100644 --- a/README.md +++ b/README.md @@ -194,7 +194,7 @@ Use your preferred SSH client to connect to the router. *Manual Installation* 1. To Download the script to your router, Copy and paste: ```bash -curl --retry 3 "https://raw.githubusercontent.com/ExtremeFiretop/MerlinAutoUpdate-Router/master/MerlinAU.sh" -o "/jffs/scripts/MerlinAU.sh" && chmod +x "/jffs/scripts/MerlinAU.sh" && sh /jffs/scripts/MerlinAU.sh install +curl --retry 3 "https://raw.githubusercontent.com/ExtremeFiretop/MerlinAutoUpdate-Router/main/MerlinAU.sh" -o "/jffs/scripts/MerlinAU.sh" && chmod +x "/jffs/scripts/MerlinAU.sh" && sh /jffs/scripts/MerlinAU.sh install ``` - The script is now ready for use!