Skip to content

Fix stable branch references after migration to main #605

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
maghuro wants to merge 1 commit into from
+10 −10
Closed

Fix stable branch references after migration to main #605

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions .github/workflows/Create-NewReleases.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -63,15 +63,15 @@ 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

- 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
Expand Down
14 changes: 7 additions & 7 deletions MerlinAU.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"

##----------------------------------------##
Expand Down Expand Up @@ -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
Expand Down Expand Up @@ -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"
Expand Down Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand Down Expand Up @@ -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 #
Expand Down Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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!

Expand Down
Loading