diff --git a/install.sh b/install.sh index 8e10ffb..b05ae1e 100755 --- a/install.sh +++ b/install.sh @@ -1,6 +1,6 @@ #!/bin/bash -if [ "$#" -ne 5 ]; then +if [ "$#" -ne 6 ]; then echo "wrong parameters" exit 1 fi @@ -10,6 +10,7 @@ slave_name=$2 server_url=$3 login=$4 private_key=$5 +client_version=$6 \rm -rf tig_pool \mkdir tig_pool @@ -20,4 +21,4 @@ pkill slave_tig 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 +./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 diff --git a/scripts/pool_tig_launch_master.sh b/scripts/pool_tig_launch_master.sh index 5bbd616..1ebe145 100644 --- a/scripts/pool_tig_launch_master.sh +++ b/scripts/pool_tig_launch_master.sh @@ -5,6 +5,7 @@ id_slave="@id@" login_discord="@login@" token_private="@tok@" machine_name="@worker@" +version="@version@" # TIG Server ip="@ip@" @@ -41,4 +42,4 @@ if [ ! -f "$worker_path" ]; then fi # If checks pass, execute the Python client -#./"$client_file" --path_to_tig "$path_tig" --id_slave "$id_slave" --login_discord "$login_discord" --token_private "$token_private" --ip "$ip" --port "$port" --add_tig "$add_tig" --url "$url" +./"$client_file" --path_to_tig "$path_tig" --id_slave "$id_slave" --login_discord "$login_discord" --token_private "$token_private" --ip "$ip" --port "$port" --add_tig "$add_tig" --url "$url" --version "$version" diff --git a/scripts/tig_pool_master.sh b/scripts/tig_pool_master.sh index 902f5a2..0cea6ff 100755 --- a/scripts/tig_pool_master.sh +++ b/scripts/tig_pool_master.sh @@ -7,7 +7,7 @@ usage() { } # Check if the total number of arguments is 14 (7 options + 7 values) -if [ "$#" -ne 12 ]; then +if [ "$#" -ne 14 ]; then usage fi @@ -15,6 +15,7 @@ fi id_slave="" nom_slave="" ip="" +v="" login_discord="" private_key="" URL_SERVER="" @@ -34,6 +35,10 @@ while [[ "$#" -gt 0 ]]; do ip="$2" shift 2 ;; + -v) + v="$2" + shift 2 + ;; -login) login_discord="$2" shift 2 @@ -140,6 +145,7 @@ 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|@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 # Grant execution permissions to the launch file chmod +x pool_tig_launch_${id_slave}_${nom_slave}.sh