Merge pull request #304 from tonstakers/update-install-scripts

Update install scripts

Author: igroman787

README.md

@@ -1,6 +1,6 @@
 ![GitHub stars](https://img.shields.io/github/stars/ton-blockchain/mytonctrl?style=flat-square&logo=github) ![GitHub forks](https://img.shields.io/github/forks/ton-blockchain/mytonctrl?style=flat-square&logo=github) ![GitHub issues](https://img.shields.io/github/issues/ton-blockchain/mytonctrl?style=flat-square&logo=github) ![GitHub pull requests](https://img.shields.io/github/issues-pr/ton-blockchain/mytonctrl?style=flat-square&logo=github) ![GitHub last commit](https://img.shields.io/github/last-commit/ton-blockchain/mytonctrl?style=flat-square&logo=github) ![GitHub license](https://img.shields.io/github/license/ton-blockchain/mytonctrl?style=flat-square&logo=github)
 
-<!-- omit from toc --> 
+<!-- omit from toc -->
 # MyTonCtrl
 
 <!-- omit from toc --> 

scripts/install.sh

@@ -16,19 +16,24 @@ author="ton-blockchain"
 repo="mytonctrl"
 branch="master"
 mode="validator"
+network="mainnet"
+ton_node_version="master"  # Default version
+
 
 show_help_and_exit() {
-  echo 'Supported argumets:'
+  echo 'Supported arguments:'
   echo ' -c  PATH         Provide custom config for toninstaller.sh'
   echo ' -t               Disable telemetry'
-  echo ' -i               Ignore minimum reqiurements'
+  echo ' -i               Ignore minimum requirements'
   echo ' -d               Use pre-packaged dump. Reduces duration of initial synchronization.'
   echo ' -a               Set MyTonCtrl git repo author'
-	echo ' -r               Set MyTonCtrl git repo'
-	echo ' -b               Set MyTonCtrl git repo branch'
-	echo ' -m  MODE             Install MyTonCtrl with specified mode (validator or liteserver)'
-	echo ' -h               Show this help'
-    exit
+  echo ' -r               Set MyTonCtrl git repo'
+  echo ' -b               Set MyTonCtrl git repo branch'
+  echo ' -m  MODE         Install MyTonCtrl with specified mode (validator or liteserver)'
+  echo ' -n  NETWORK      Specify the network (mainnet or testnet)'
+  echo ' -v  VERSION      Specify the ton node version (commit, branch, or tag)'
+  echo ' -h               Show this help'
+  exit
 }
 
 if [[ "${1-}" =~ ^-*h(elp)?$ ]]; then
@@ -40,36 +45,44 @@ config="https://ton-blockchain.github.io/global.config.json"
 telemetry=true
 ignore=false
 dump=false
-
-
-
-while getopts c:tida:r:b:m: flag
-do
-	case "${flag}" in
-		c) config=${OPTARG};;
-		t) telemetry=false;;
-		i) ignore=true;;
-		d) dump=true;;
-		a) author=${OPTARG};;
-		r) repo=${OPTARG};;
-		b) branch=${OPTARG};;
-    m) mode=${OPTARG};;
-		h) show_help_and_exit;;
-		*)
+cpu_required=16
+mem_required=64000000  # 64GB in KB
+
+while getopts ":c:tida:r:b:m:n:v:h" flag; do
+    case "${flag}" in
+        c) config=${OPTARG};;
+        t) telemetry=false;;
+        i) ignore=true;;
+        d) dump=true;;
+        a) author=${OPTARG};;
+        r) repo=${OPTARG};;
+        b) branch=${OPTARG};;
+        m) mode=${OPTARG};;
+        n) network=${OPTARG};;
+        v) ton_node_version=${OPTARG};;
+        h) show_help_and_exit;;
+        *)
             echo "Flag -${flag} is not recognized. Aborting"
             exit 1 ;;
-	esac
+    esac
 done
 
+# Set config based on network argument
+if [ "${network}" = "testnet" ]; then
+    config="https://ton-blockchain.github.io/testnet-global.config.json"
+    cpu_required=8
+    mem_required=16000000  # 16GB in KB
+fi
+
 # check machine configuration
 echo -e "${COLOR}[1/5]${ENDC} Checking system requirements"
 
 cpus=$(lscpu | grep "CPU(s)" | head -n 1 | awk '{print $2}')
 memory=$(cat /proc/meminfo | grep MemTotal | awk '{print $2}')
 
 echo "This machine has ${cpus} CPUs and ${memory}KB of Memory"
-if [ "$ignore" = false ] && ([ "${cpus}" -lt 16 ] || [ "${memory}" -lt 64000000 ]); then
-	echo "Insufficient resources. Requires a minimum of 16 processors and 64Gb RAM."
+if [ "$ignore" = false ] && ([ "${cpus}" -lt "${cpu_required}" ] || [ "${memory}" -lt "${mem_required}"]); then
+	echo "Insufficient resources. Requires a minimum of "${cpu_required}"  processors and  "${mem_required}" RAM."
 	exit 1
 fi
 
@@ -92,7 +105,7 @@ file3=${BIN_DIR}/ton/validator-engine-console/validator-engine-console
 if  [ ! -f "${file1}" ] || [ ! -f "${file2}" ] || [ ! -f "${file3}" ]; then
 	echo "TON does not exists, building"
 	wget https://raw.githubusercontent.com/${author}/${repo}/${branch}/scripts/ton_installer.sh -O /tmp/ton_installer.sh
-	bash /tmp/ton_installer.sh -c ${config}
+	bash /tmp/ton_installer.sh -c ${config} -v ${ton_node_version}
 fi
 
 # Cloning mytonctrl
@@ -129,5 +142,10 @@ mkdir -p ${version_dir}
 echo ${migrate_version} > ${version_path}
 chown ${user}:${user} ${version_dir} ${version_path}
 
+# create symbolic link if branch not eq mytonctrl
+if [ "${repo}" != "mytonctrl" ]; then
+    ln -sf ${SOURCES_DIR}/${repo} ${SOURCES_DIR}/mytonctrl
+fi
+
 echo -e "${COLOR}[5/5]${ENDC} Mytonctrl installation completed"
 exit 0

scripts/ton_installer.sh

@@ -8,15 +8,20 @@ if [ "$(id -u)" != "0" ]; then
 	exit 1
 fi
 
-# Get arguments
-config=https://ton-blockchain.github.io/global.config.json
-while getopts c: flag
-do
-	case "${flag}" in
-		c) config=${OPTARG};;
-	esac
+while getopts ":c:v:h" flag; do
+    case "${flag}" in
+        c) config=${OPTARG};;
+        v) ton_node_version=${OPTARG};;
+        h) show_help_and_exit;;
+        *)
+            echo "Flag -${flag} is not recognized. Aborting"
+            exit 1 ;;
+    esac
 done
 
+echo "config: ${config}"
+echo "checkout to ${ton_node_version}"
+
 # Цвета
 COLOR='\033[95m'
 ENDC='\033[0m'
@@ -71,7 +76,7 @@ elif [[ "$OSTYPE" =~ darwin.* ]]; then
 
 	echo "Please, write down your username, because brew package manager cannot be run under root user:"
 	read LOCAL_USERNAME
-	
+
 	su $LOCAL_USERNAME -c "brew update"
 	su $LOCAL_USERNAME -c "brew install openssl cmake llvm"
 elif [ "$OSTYPE" == "freebsd"* ]; then
@@ -104,6 +109,15 @@ echo -e "${COLOR}[3/6]${ENDC} Preparing for compilation"
 cd $SOURCES_DIR
 rm -rf $SOURCES_DIR/ton
 git clone --recursive https://github.com/ton-blockchain/ton.git
+
+echo "checkout to ${ton_node_version}"
+
+if [ "${ton_node_version}" != "master" ]; then
+  cd $SOURCES_DIR/ton
+  git checkout ${ton_node_version}
+  cd ../
+fi
+
 git config --global --add safe.directory $SOURCES_DIR/ton
 
 # Подготавливаем папки для компиляции