add branch option to btc teleport upgrading

Author: yungwine

modules/btc_teleport.py

@@ -55,20 +55,20 @@ def add_daemon(self):
         user = os.environ.get("USER", "root")
         run_as_root(['bash', script_path, '-n', 'btc_teleport', '-u', user, '-g', user, '-s', start, '-w', self.bin_dir])
 
-    def install(self):
+    def install(self, branch):
         script_path = pkg_resources.resource_filename('mytonctrl', 'scripts/btc_teleport1.sh')
-        exit_code = run_as_root(["bash", script_path, "-s", '/usr/src', "-r", self.repo_name])
+        exit_code = run_as_root(["bash", script_path, "-s", '/usr/src', "-r", self.repo_name, "-b", branch])
         if exit_code != 0:
             raise Exception('Failed to install btc_teleport')
         script_path = pkg_resources.resource_filename('mytonctrl', 'scripts/btc_teleport2.sh')
         subprocess.run(["bash", script_path, "-s", self.src_dir])
 
-    def init(self, reinstall=False):
+    def init(self, reinstall=False, branch: str = 'master'):
         if os.path.exists(self.src_dir) and not reinstall:
             return
         self.local.add_log('Installing btc_teleport', 'info')
         os.makedirs(self.keystore_path, mode=0o700, exist_ok=True)
-        self.install()
+        self.install(branch)
         self.create_env_file()
         self.add_daemon()
         self.local.add_log('Installed btc_teleport', 'info')

mytonctrl/mytonctrl.py

@@ -348,9 +348,10 @@ def Update(local, args):
 	local.exit()
 #end define
 
-def Upgrade(local, ton, args):
-	if '--btc-teleport' in args:  # upgrade --btc-teleport
-		upgrade_btc_teleport(local, ton, reinstall=True)
+def Upgrade(local, ton, args: list):
+	if '--btc-teleport' in args:  # upgrade --btc-teleport [branch]
+		branch = args[args.index('--btc-teleport') + 1] if len(args) > args.index('--btc-teleport') + 1 else 'master'
+		upgrade_btc_teleport(local, ton, reinstall=True, branch=branch)
 		return
 	repo = "ton"
 	author, repo, branch = check_git(args, repo, "upgrade")
@@ -386,10 +387,10 @@ def Upgrade(local, ton, args):
 	color_print(text)
 #end define
 
-def upgrade_btc_teleport(local, ton, reinstall=False):
+def upgrade_btc_teleport(local, ton, reinstall=False, branch: str = 'master'):
 	from modules.btc_teleport import BtcTeleportModule
 	module = BtcTeleportModule(ton, local)
-	local.try_function(module.init, args=[reinstall])
+	local.try_function(module.init, args=[reinstall, branch])
 
 def rollback_to_mtc1(local, ton,  args):
 	color_print("{red}Warning: this is dangerous, please make sure you've backed up mytoncore's db.{endc}")

mytonctrl/scripts/btc_teleport1.sh

@@ -1,12 +1,14 @@
 REPO=""
 SRC_DIR=""
 USER=$(logname)
+BRANCH=master
 
-while getopts s:r: flag
+while getopts s:r:b: flag
 do
 	case "${flag}" in
 		s) SRC_DIR=${OPTARG};;
     r) REPO=${OPTARG};;
+    b) BRANCH=${OPTARG};;
     *) echo "Flag -${flag} is not recognized. Aborting"; exit 1 ;;
 	esac
 done
@@ -27,6 +29,8 @@ REPO_URL=https://github.com/RSquad/${REPO}.git
 cd $SRC_DIR || exit 1
 rm -rf $REPO
 git clone $REPO_URL
+cd $REPO && git checkout $BRANCH
+cd ..
 
 chown -R $USER:$USER $REPO