From e4c09c5b65bb658a9e1bf18cb5cc1e0486a51daa Mon Sep 17 00:00:00 2001
From: yourok <8yourok8@mail.ru>
Date: Sat, 13 Jan 2024 12:04:46 +0300
Subject: [PATCH] update

---
 docker/start.sh | 45 +++++++++++++++++----------------------------
 1 file changed, 17 insertions(+), 28 deletions(-)
 mode change 100755 => 100644 docker/start.sh

diff --git a/docker/start.sh b/docker/start.sh
old mode 100755
new mode 100644
index 6524ac8..c15a220
--- a/docker/start.sh
+++ b/docker/start.sh
@@ -16,38 +16,27 @@ binName="TorrServer-linux-${architecture}"
 mkdir -p /opt/torrserver
 cd /opt/torrserver
 
-wget "https://github.com/YouROK/TorrServer/releases/latest/download/$binName"
+rm -f ${binName}*
+
+wget -O $binName "https://github.com/YouROK/TorrServer/releases/latest/download/$binName"
 chmod +x $binName
 
 FLAGS=""
 
-echo "TS_PORT:$TS_PORT"
-echo "TS_PATH:$TS_PATH"
-echo "TS_LOGPATHDIR:$TS_LOGPATHDIR"
-echo "TS_LOGFILE:$TS_LOGPATHDIR/$TS_LOGFILE"
-echo "TS_WEBLOGFILE:$TS_LOGPATHDIR/$TS_WEBLOGFILE"
-echo "TS_RDB:$TS_RDB"
-echo "TS_HTTPAUTH:$TS_HTTPAUTH"
-echo "TS_DONTKILL:$TS_DONTKILL"
-echo "TS_TORRENTSDIR:$TS_TORRENTSDIR"
-echo "TS_TORRENTADDR:$TS_TORRENTADDR"
-echo "TS_PUBIPV4:$TS_PUBIPV4"
-echo "TS_PUBIPV6:$TS_PUBIPV6"
-echo "TS_SEARCHWA:$TS_SEARCHWA"
-
 #sets start flags
-[ ! -z "$TS_PORT" ] && FLAGS="${FLAGS} --port ${TS_PORT}"
-[ ! -z "$TS_PATH" ] && FLAGS="${FLAGS} --path ${TS_PATH}"
-[ ! -z "$TS_LOGFILE" ] && FLAGS="${FLAGS} --logpath $TS_LOGPATHDIR/${TS_LOGFILE}"
-[ ! -z "$TS_WEBLOGFILE" ] && FLAGS="${FLAGS} --weblogpath $TS_LOGPATHDIR/${TS_WEBLOGFILE}"
-[ ! -z "$TS_RDB" ] && FLAGS="${FLAGS} --rdb"
-[ ! -z "$TS_HTTPAUTH" ] && FLAGS="${FLAGS} --httpauth"
-[ ! -z "$TS_DONTKILL" ] && FLAGS="${FLAGS} --dontkill"
-[ ! -z "$TS_TORRENTSDIR" ] && FLAGS="${FLAGS} --torrentsdir ${TS_TORRENTSDIR}"
-[ ! -z "$TS_TORRENTADDR" ] && FLAGS="${FLAGS} --torrentaddr ${TS_TORRENTADDR}"
-[ ! -z "$TS_PUBIPV4" ] && FLAGS="${FLAGS} --pubipv4 ${TS_PUBIPV4}"
-[ ! -z "$TS_PUBIPV6" ] && FLAGS="${FLAGS} --pubipv6 ${TS_PUBIPV6}"
-[ ! -z "$TS_SEARCHWA" ] && FLAGS="${FLAGS} --searchwa"
+[ ! -z "$TS_PORT" ] && echo "TS_PORT: $TS_PORT" && FLAGS="${FLAGS} --port ${TS_PORT}"
+[ ! -z "$TS_PATH" ] && echo "TS_PATH: $TS_PATH" && FLAGS="${FLAGS} --path ${TS_PATH}"
+[ ! -z "$TS_LOGPATHDIR" ] && echo "TS_LOGPATHDIR: $TS_LOGPATHDIR" && FLAGS="${FLAGS}"
+[ ! -z "$TS_LOGFILE" ] && echo "TS_LOGFILE: $TS_LOGPATHDIR/$TS_LOGFILE" && FLAGS="${FLAGS} --logpath $TS_LOGPATHDIR/${TS_LOGFILE}"
+[ ! -z "$TS_WEBLOGFILE" ] && echo "TS_WEBLOGFILE: $TS_LOGPATHDIR/$TS_WEBLOGFILE" && FLAGS="${FLAGS} --weblogpath $TS_LOGPATHDIR/${TS_WEBLOGFILE}"
+[ ! -z "$TS_RDB" ] | [ "$TS_RDB" = "true" ] && echo "TS_RDB: $TS_RDB" && FLAGS="${FLAGS} --rdb"
+[ ! -z "$TS_HTTPAUTH" ] && echo "TS_HTTPAUTH: $TS_HTTPAUTH" && FLAGS="${FLAGS} --httpauth"
+[ ! -z "$TS_DONTKILL" ] && echo "TS_DONTKILL: $TS_DONTKILL" && FLAGS="${FLAGS} --dontkill"
+[ ! -z "$TS_TORRENTSDIR" ] && echo "TS_TORRENTSDIR: $TS_TORRENTSDIR" && FLAGS="${FLAGS} --torrentsdir ${TS_TORRENTSDIR}"
+[ ! -z "$TS_TORRENTADDR" ] && echo "TS_TORRENTADDR: $TS_TORRENTADDR" && FLAGS="${FLAGS} --torrentaddr ${TS_TORRENTADDR}"
+[ ! -z "$TS_PUBIPV4" ] && echo "TS_PUBIPV4: $TS_PUBIPV4" && FLAGS="${FLAGS} --pubipv4 ${TS_PUBIPV4}"
+[ ! -z "$TS_PUBIPV6" ] && echo "TS_PUBIPV6: $TS_PUBIPV6" && FLAGS="${FLAGS} --pubipv6 ${TS_PUBIPV6}"
+[ ! -z "$TS_SEARCHWA" ]&& echo "TS_SEARCHWA: $TS_SEARCHWA" && FLAGS="${FLAGS} --searchwa"
 
 #make directories
 [ ! -z "$TS_PATH" ] && [ ! -d "$TS_PATH" ] && mkdir -p $TS_PATH
@@ -58,4 +47,4 @@ echo "Running with: ${FLAGS}"
 export GODEBUG=madvdontneed=1
 
 /opt/torrserver/${binName} ${FLAGS}
-
+rm -f /opt/torrserver/${binName}