- Timestamp:
- Jul 26, 2015, 5:20:54 PM (9 years ago)
- Location:
- scripts/usr/local/lib/7dtd
- Files:
-
- 1 added
- 6 edited
Legend:
- Unmodified
- Added
- Removed
-
scripts/usr/local/lib/7dtd/VERSION
r242 r248 1 Version: 93 2 Release: 2015-07-06 3 DediBuild: 682942 1 Version: 94 2 Release: 2015-07-26 4 3 -
scripts/usr/local/lib/7dtd/commands/instances.sh
r90 r248 9 9 if [ $(isRunning $I) -eq 1 ]; then 10 10 run="yes" 11 cur=$(telnetCommand $I lp | grep - E "^\s?Total of " | cut -d\ -f 3)11 cur=$(telnetCommand $I lp | grep -aE "^\s?Total of " | cut -d\ -f 3) 12 12 else 13 13 run="no" -
scripts/usr/local/lib/7dtd/commands/status.sh
r90 r248 20 20 echo "Open ports:" 21 21 netstat -nlp | grep $(getInstancePID $1) | sed -r 's/^([^ ]*)\s+.*[^ :]*:([^ ]*).*[^ :]*:[^ ]*.*/ \2 (\1)/g' | sort 22 cur=$(telnetCommand $1 lp | grep - E "^\s?Total of " | cut -d\ -f 3)22 cur=$(telnetCommand $1 lp | grep -aE "^\s?Total of " | cut -d\ -f 3) 23 23 echo "Players: $cur" 24 24 else -
scripts/usr/local/lib/7dtd/commands/stop.sh
r204 r248 45 45 if [ $(isRunning $1) -eq 1 ]; then 46 46 echo "Failed, force closing server..." 47 $SSD --stop -- pidfile $(getInstancePath $1)/7dtd.pid47 $SSD --stop --signal KILL --pidfile $(getInstancePath $1)/7dtd.pid 48 48 fi 49 49 -
scripts/usr/local/lib/7dtd/commands/updateengine.sh
r239 r248 4 4 5 5 sdtdCommandUpdateengine() { 6 local FORCED=no 7 local CHECKONLY=no 8 if [ "$1" = "--force" ]; then 9 FORCED=yes 10 fi 6 # local FORCED=no 7 # if [ "$1" = "--force" ]; then 8 # FORCED=yes 9 # fi 11 10 12 11 if [ ! -e $SDTD_BASE/steamcmd ]; then … … 19 18 fi 20 19 21 if [ "$1" = "--check" -o "$2" = "--check" ]; then22 local LOCAL=$(getLocalEngineVersion)23 local REMOTE=$(getRemoteEngineVersion)24 if [ $REMOTE -gt $LOCAL ]; then25 echo "Newer engine version available."26 else27 echo "Engine up to date."28 fi29 echo "Local buildid: $LOCAL"30 echo "Available buildid: $REMOTE"31 return32 fi20 # if [ "$1" = "--check" -o "$2" = "--check" ]; then 21 # local LOCAL=$(getLocalEngineVersion) 22 # local REMOTE=$(getRemoteEngineVersion) 23 # if [ $REMOTE -gt $LOCAL ]; then 24 # echo "Newer engine version available." 25 # else 26 # echo "Engine up to date." 27 # fi 28 # echo "Local buildid: $LOCAL" 29 # echo "Available buildid: $REMOTE" 30 # return 31 # fi 33 32 34 33 for I in $(getInstanceList); do … … 42 41 local LOCAL=$(getLocalEngineVersion) 43 42 #local REMOTE=$(getRemoteEngineVersion) 44 local LOCAL_SUPPORTED_BUILD=$(cat /usr/local/lib/7dtd/VERSION | grep "DediBuild" | cut -d\ -f2)43 #local LOCAL_SUPPORTED_BUILD=$(cat /usr/local/lib/7dtd/VERSION | grep "DediBuild" | cut -d\ -f2) 45 44 46 45 # if [ "$FORCED" = "yes" -o $REMOTE -gt $LOCAL ]; then … … 51 50 52 51 # if [ "$LOCAL_SUPPORTED_BUILD" != "$REMOTE" ]; then 53 echo "WARNING!!! The currently installed version of the scripts might not support the newer dedicated server build!"54 echo "If you continue you might not be able to start the server."52 # echo "WARNING!!! The currently installed version of the scripts might not support the newer dedicated server build!" 53 # echo "If you continue you might not be able to start the server." 55 54 # echo "Please wait for an updated release of the scripts or continue at your own risk." 56 echo55 # echo 57 56 # fi 58 57 … … 85 84 ./steamcmd.sh +login $STEAM_USER $STEAM_PASS +force_install_dir $SDTD_BASE/engine +app_update 294420 validate +quit 86 85 86 if [ -d /usr/local/lib/7dtd/server-fixes ]; then 87 87 cp /usr/local/lib/7dtd/server-fixes/* $SDTD_BASE/engine/ -R 88 fi 88 89 89 90 chown $SDTD_USER.$SDTD_GROUP -R $SDTD_BASE/engine 90 91 91 if [ "$LOCAL_SUPPORTED_BUILD" != "$REMOTE" ]; then92 echo93 echo "Also update the scripts as soon as there is a new release for this dedicated server build."94 echo95 fi92 # if [ "$LOCAL_SUPPORTED_BUILD" != "$REMOTE" ]; then 93 # echo 94 # echo "Also update the scripts as soon as there is a new release for this dedicated server build." 95 # echo 96 # fi 96 97 # else 97 98 # echo "Engine is already at the newest build (local: $LOCAL, remote: $REMOTE)." -
scripts/usr/local/lib/7dtd/commands/updatescripts.sh
r225 r248 8 8 9 9 local LOCAL_BUILD=$(getLocalEngineVersion) 10 local LOCAL_SUPPORTED_BUILD=$(cat /usr/local/lib/7dtd/VERSION | grep "DediBuild" | cut -d\ -f2)11 local REMOTE_SUPPORTED_BUILD=$(wget -qO- http://illy.bz/fi/7dtd/VERSION | grep "DediBuild" | cut -d\ -f2)12 10 13 11 local FORCED … … 19 17 if [ "$FORCED" = "yes" -o $REMOTE -gt $LOCAL ]; then 20 18 echo "A newer version of the scripts is available." 21 echo "Local: v.$LOCAL (supported dedi build: $LOCAL_SUPPORTED_BUILD)"22 echo "Available: v.$REMOTE (supported dedi build: $REMOTE_SUPPORTED_BUILD)"19 echo "Local: v.$LOCAL" 20 echo "Available: v.$REMOTE" 23 21 echo 24 22 echo "Please check the release notes before continuing:" 25 23 echo " https://7dtd.illy.bz/wiki/Release%20Notes" 26 24 echo 27 28 if [ "$LOCAL_BUILD" != "$REMOTE_SUPPORTED_BUILD" ]; then29 echo "NOTE: The newer scripts are made for a more recent build ($REMOTE_SUPPORTED_BUILD) of the dedicated server than you are running ($LOCAL_BUILD)!"30 echo "You will have to update the engine after updating to those new scripts!"31 echo32 fi33 25 34 26 while : ; do … … 62 54 chmod 0755 /usr/local/lib/7dtd -R 63 55 64 if [ -e $SDTD_BASE/engine/7DaysToDie_Data/Managed ]; then 65 cp /usr/local/lib/7dtd/server-fixes/* $SDTD_BASE/engine/ -R 66 chown $SDTD_USER.$SDTD_GROUP -R $SDTD_BASE/engine/ 56 if [ -d $SDTD_BASE/engine ]; then 57 if [ -d /usr/local/lib/7dtd/server-fixes ]; then 58 cp /usr/local/lib/7dtd/server-fixes/* $SDTD_BASE/engine/ -R 59 chown $SDTD_USER.$SDTD_GROUP -R $SDTD_BASE/engine/ 60 fi 67 61 fi 68 62 … … 73 67 echo "were new files added to the user folder /home/sdtd those changes" 74 68 echo "have not been applied!" 75 76 if [ "$LOCAL_BUILD" != "$REMOTE_SUPPORTED_BUILD" ]; then77 echo78 echo "Please do now update the engine by running '7dtd.sh updateengine'"79 fi80 69 else 81 70 echo "Scripts are already at the newest version (v.$LOCAL)."
Note:
See TracChangeset
for help on using the changeset viewer.