feat: Allow to checkout another branch of MyTomato

toulousain79 · Sep 22, 2024 · efb2fbc · efb2fbc
1 parent 21cb89f
commit efb2fbc
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 3 deletions.
diff --git a/root/SCRIPTs/Upgrade.sh b/root/SCRIPTs/Upgrade.sh
@@ -31,9 +31,9 @@ if [[ ${gbRepoUpgrade_Enable:-0} -eq 1 ]]; then
     [[ -d /opt/MyTomato ]] && cd "/opt/MyTomato" || exit 1
     logger -p user.notice "| ${gsScriptName} | Update /opt/MyTomato via GitHub"
     git fetch origin
-    git reset --hard origin/master
+    git reset --hard origin/"${gsMyTomatoBranch}"
     git config pull.rebase false
-    git pull origin master
+    git pull origin "${gsMyTomatoBranch}"
 fi
 
 #### DNScrypt-proxy v2

diff --git a/root/SCRIPTs/inc/vars b/root/SCRIPTs/inc/vars
@@ -16,6 +16,9 @@ gsUrlArmExtras="https://exotic.se/freshtomato-arm/${gsFirmwareYear}/${gsFirmware
 gsLocales="en_US"
 gsTimezone="Europe/Paris"
 
+## MyTomato
+gsMyTomatoBranch="master"
+
 ## Colors
 export CEND="\033[0m"
 export CDEFAULT='\033[0;39m'
@@ -84,7 +87,7 @@ gsExternalDns=""                       # External DNS server like PiHole instead
 gbRepoUpgrade_Enable=1 # Off = 0 / On = 1
 
 #### Export
-export binCurl gsDirArmExtras gsUrlArmExtras gsLocales gsTimezone
+export binCurl gsDirArmExtras gsUrlArmExtras gsLocales gsTimezone gsMyTomatoBranch
 export gsScriptName gsDirRoot gsDirScripts gsDirOpenVpn gsDirBackups gsDirLogs gsDirTemplates gsDirOverLoad gsDirDnscrypt gsDirDnscryptGen
 export gsUsbFileSystem gsUsbOptUuid gsWan1_DNS gsExternalDns gsP2Partisan_UdpPorts gsP2Partisan_TcpPorts
 export gdDateTime

diff --git a/root/TEMPLATEs/vars.tmpl b/root/TEMPLATEs/vars.tmpl
@@ -9,6 +9,7 @@ gsUsbOptUuid=""
 # Locales
 gsLocales="en_US"         # ex: "fr_FR", check /opt/usr/share/i18n/locales/
 gsTimezone="Europe/Paris" # https://github.com/Entware/Entware/wiki/Using-time-zones
+gsMyTomatoBranch="master"
 
 ########################################
 #### Services