From ebec7f5d2c123b71d5e657c83d0c694d2a2eb0fa Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fran=C3=A7ois=20Patron?= Date: Fri, 13 Dec 2024 14:12:31 +0100 Subject: [PATCH] add port as parameter --- install.sh | 11 ++++++----- scripts/pool_tig_launch_master.sh | 2 +- scripts/tig_pool_master.sh | 15 +++++++++++---- 3 files changed, 18 insertions(+), 10 deletions(-) diff --git a/install.sh b/install.sh index 31553d5..1a9b787 100755 --- a/install.sh +++ b/install.sh @@ -1,6 +1,6 @@ #!/bin/bash -if [ "$#" -ne 6 ]; then +if [ "$#" -ne 7 ]; then echo "wrong parameters" exit 1 fi @@ -8,9 +8,10 @@ fi slave_id=$1 slave_name=$2 server_url=$3 -login=$4 -private_key=$5 -client_version=$6 +port=$4 +login=$5 +private_key=$6 +client_version=$7 \rm -rf tig_pool \mkdir tig_pool @@ -20,4 +21,4 @@ screen -ls | grep pool_tig | awk '{print $1}' | xargs -I {} screen -S {} -X kill wget https://raw.githubusercontent.com/tig-pool-nk/client/refs/heads/main/scripts/tig_pool_master.sh sudo chmod +x tig_pool_master.sh -./tig_pool_master.sh -id_slave $slave_id -nom_slave $slave_name -ip $server_url -login $login -tok $private_key -url $server_url -v $client_version +./tig_pool_master.sh -id_slave $slave_id -nom_slave $slave_name -ip $server_url -port $port -login $login -tok $private_key -url $server_url -v $client_version diff --git a/scripts/pool_tig_launch_master.sh b/scripts/pool_tig_launch_master.sh index 1ebe145..465ddc9 100644 --- a/scripts/pool_tig_launch_master.sh +++ b/scripts/pool_tig_launch_master.sh @@ -9,7 +9,7 @@ version="@version@" # TIG Server ip="@ip@" -port="6666" +port="@port@" add_tig="" # WEB + port diff --git a/scripts/tig_pool_master.sh b/scripts/tig_pool_master.sh index c800a08..e8ce3c8 100755 --- a/scripts/tig_pool_master.sh +++ b/scripts/tig_pool_master.sh @@ -2,12 +2,12 @@ # Function to display usage usage() { - echo "Usage: $0 -id_slave -nom_slave -ip -login -tok -url " + echo "Usage: $0 -id_slave -nom_slave -ip -port -login -tok -url " exit 1 } -# Check if the total number of arguments is 14 (7 options + 7 values) -if [ "$#" -ne 14 ]; then +# Check if the total number of arguments ok +if [ "$#" -ne 16 ]; then usage fi @@ -15,6 +15,7 @@ fi id_slave="" nom_slave="" ip="" +port="" v="" login_discord="" private_key="" @@ -35,6 +36,10 @@ while [[ "$#" -gt 0 ]]; do ip="$2" shift 2 ;; + -port) + port="$2" + shift 2 + ;; -v) v="$2" shift 2 @@ -59,7 +64,7 @@ while [[ "$#" -gt 0 ]]; do done # Ensure variables are not empty -if [ -z "$id_slave" ] || [ -z "$nom_slave" ] || [ -z "$ip" ] || [ -z "$login_discord" ] || [ -z "$private_key" ] || [ -z "$URL_SERVER" ]; then +if [ -z "$id_slave" ] || [ -z "$nom_slave" ] || [ -z "$ip" ] || [ -z "$port" ] || [ -z "$login_discord" ] || [ -z "$private_key" ] || [ -z "$URL_SERVER" ]; then usage fi @@ -75,6 +80,7 @@ current_path=$(pwd) echo "ID Slave: $id_slave" echo "Slave Name: $nom_slave" echo "IP: $ip" +echo "Port: $port" echo "Login: $login_discord" echo "Private Key: $private_key" echo "URL Server: $URL_SERVER" @@ -143,6 +149,7 @@ sed -i "s|@login@|$login_discord|g" pool_tig_launch_${id_slave}_${nom_slave}.sh sed -i "s|@tok@|$private_key|g" pool_tig_launch_${id_slave}_${nom_slave}.sh sed -i "s|@worker@|$nom_slave|g" pool_tig_launch_${id_slave}_${nom_slave}.sh sed -i "s|@ip@|$ip|g" pool_tig_launch_${id_slave}_${nom_slave}.sh +sed -i "s|@port@|$port|g" pool_tig_launch_${id_slave}_${nom_slave}.sh sed -i "s|@url@|http://$URL_SERVER|g" pool_tig_launch_${id_slave}_${nom_slave}.sh sed -i "s|@version@|$v|g" pool_tig_launch_${id_slave}_${nom_slave}.sh