Просмотр исходного кода

Merge pull request #765 from drantor/ts3-change-password

Fix more TS3 change password related issues
Daniel Gibbs 10 лет назад
Родитель
Сommit
c8b289671a
2 измененных файлов с 2 добавлено и 1 удалено
  1. 1 1
      functions/command_start.sh
  2. 1 0
      functions/command_ts3_server_pass.sh

+ 1 - 1
functions/command_start.sh

@@ -56,7 +56,7 @@ mv "${scriptlog}" "${scriptlogdate}"
 date > "${rootdir}/${lockselfname}"
 date > "${rootdir}/${lockselfname}"
 cd "${executabledir}"
 cd "${executabledir}"
 if [ "${ts3serverpass}" == "1" ];then
 if [ "${ts3serverpass}" == "1" ];then
-	./ts3server_startscript.sh start serveradmin_password="${newpassword}" 
+	./ts3server_startscript.sh start serveradmin_password="${newpassword}" inifile="${servercfgfullpath}"
 else
 else
 	./ts3server_startscript.sh start inifile="${servercfgfullpath}" > /dev/null 2>&1
 	./ts3server_startscript.sh start inifile="${servercfgfullpath}" > /dev/null 2>&1
 fi
 fi

+ 1 - 0
functions/command_ts3_server_pass.sh

@@ -45,6 +45,7 @@ fn_printinfonl "Starting server with new password"
 command_start.sh
 command_start.sh
 # Stop server in "new password mode"
 # Stop server in "new password mode"
 command_stop.sh
 command_stop.sh
+ts3serverpass="0"
 fn_printoknl "Password applied"
 fn_printoknl "Password applied"
 fn_scriptlog "New ServerAdmin password applied"
 fn_scriptlog "New ServerAdmin password applied"
 sleep 1
 sleep 1