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

Resolved lockfile full path bug

Fixed: If using full path to script lock file was not being detected in
monitor causing the monitor to not work. This broke automatic
monitoring.
Daniel Gibbs 12 лет назад
Родитель
Сommit
c123316b63

+ 2 - 2
CounterStrike/csserver

@@ -3,7 +3,7 @@
 # Server Management Script
 # Server Management Script
 # Author: Daniel Gibbs
 # Author: Daniel Gibbs
 # Website: http://danielgibbs.co.uk
 # Website: http://danielgibbs.co.uk
-# Version: 220614
+# Version: 010814
 
 
 #### Variables ####
 #### Variables ####
 
 
@@ -41,7 +41,7 @@ engine="goldsource"
 # Directorys
 # Directorys
 rootdir="$(cd "$(dirname "${BASH_SOURCE[0]}" )" && pwd )"
 rootdir="$(cd "$(dirname "${BASH_SOURCE[0]}" )" && pwd )"
 selfname="$0"
 selfname="$0"
-lockselfname=$(echo "${selfname}.lock"|sed 's/^\(.\{1\}\).\(.*\)/\1\2/')
+lockselfname=$(echo ".${servicename}.lock")
 filesdir="${rootdir}/serverfiles"
 filesdir="${rootdir}/serverfiles"
 systemdir="${filesdir}/cstrike"
 systemdir="${filesdir}/cstrike"
 executabledir="${filesdir}"
 executabledir="${filesdir}"

+ 2 - 2
CounterStrikeConditionZero/csczserver

@@ -3,7 +3,7 @@
 # Server Management Script
 # Server Management Script
 # Author: Daniel Gibbs
 # Author: Daniel Gibbs
 # Website: http://danielgibbs.co.uk
 # Website: http://danielgibbs.co.uk
-# Version: 220614
+# Version: 010814
 
 
 #### Variables ####
 #### Variables ####
 
 
@@ -41,7 +41,7 @@ engine="goldsource"
 # Directorys
 # Directorys
 rootdir="$(cd "$(dirname "${BASH_SOURCE[0]}" )" && pwd )"
 rootdir="$(cd "$(dirname "${BASH_SOURCE[0]}" )" && pwd )"
 selfname="$0"
 selfname="$0"
-lockselfname=$(echo "${selfname}.lock"|sed 's/^\(.\{1\}\).\(.*\)/\1\2/')
+lockselfname=$(echo ".${servicename}.lock")
 filesdir="${rootdir}/serverfiles"
 filesdir="${rootdir}/serverfiles"
 systemdir="${filesdir}/czero"
 systemdir="${filesdir}/czero"
 executabledir="${filesdir}"
 executabledir="${filesdir}"

+ 2 - 2
CounterStrikeGlobalOffensive/csgoserver

@@ -3,7 +3,7 @@
 # Server Management Script
 # Server Management Script
 # Author: Daniel Gibbs
 # Author: Daniel Gibbs
 # Website: http://danielgibbs.co.uk
 # Website: http://danielgibbs.co.uk
-# Version: 220614
+# Version: 010814
 
 
 #### Variables ####
 #### Variables ####
 
 
@@ -59,7 +59,7 @@ engine="source"
 # Directorys
 # Directorys
 rootdir="$(cd "$(dirname "${BASH_SOURCE[0]}" )" && pwd )"
 rootdir="$(cd "$(dirname "${BASH_SOURCE[0]}" )" && pwd )"
 selfname="$0"
 selfname="$0"
-lockselfname=$(echo "${selfname}.lock"|sed 's/^\(.\{1\}\).\(.*\)/\1\2/')
+lockselfname=$(echo ".${servicename}.lock")
 filesdir="${rootdir}/serverfiles"
 filesdir="${rootdir}/serverfiles"
 systemdir="${filesdir}/csgo"
 systemdir="${filesdir}/csgo"
 executabledir="${filesdir}"
 executabledir="${filesdir}"

+ 2 - 2
CounterStrikeSource/cssserver

@@ -3,7 +3,7 @@
 # Server Management Script
 # Server Management Script
 # Author: Daniel Gibbs
 # Author: Daniel Gibbs
 # Website: http://danielgibbs.co.uk
 # Website: http://danielgibbs.co.uk
-# Version: 220614
+# Version: 010814
 
 
 #### Variables ####
 #### Variables ####
 
 
@@ -42,7 +42,7 @@ engine="source"
 # Directorys
 # Directorys
 rootdir="$(cd "$(dirname "${BASH_SOURCE[0]}" )" && pwd )"
 rootdir="$(cd "$(dirname "${BASH_SOURCE[0]}" )" && pwd )"
 selfname="$0"
 selfname="$0"
-lockselfname=$(echo "${selfname}.lock"|sed 's/^\(.\{1\}\).\(.*\)/\1\2/')
+lockselfname=$(echo ".${servicename}.lock")
 filesdir="${rootdir}/serverfiles"
 filesdir="${rootdir}/serverfiles"
 systemdir="${filesdir}/cstrike"
 systemdir="${filesdir}/cstrike"
 executabledir="${filesdir}"
 executabledir="${filesdir}"

+ 2 - 2
DayOfDefeat/dodserver

@@ -3,7 +3,7 @@
 # Server Management Script
 # Server Management Script
 # Author: Daniel Gibbs
 # Author: Daniel Gibbs
 # Website: http://danielgibbs.co.uk
 # Website: http://danielgibbs.co.uk
-# Version: 220614
+# Version: 010814
 
 
 #### Variables ####
 #### Variables ####
 
 
@@ -41,7 +41,7 @@ engine="goldsource"
 # Directorys
 # Directorys
 rootdir="$(cd "$(dirname "${BASH_SOURCE[0]}" )" && pwd )"
 rootdir="$(cd "$(dirname "${BASH_SOURCE[0]}" )" && pwd )"
 selfname="$0"
 selfname="$0"
-lockselfname=$(echo "${selfname}.lock"|sed 's/^\(.\{1\}\).\(.*\)/\1\2/')
+lockselfname=$(echo ".${servicename}.lock")
 filesdir="${rootdir}/serverfiles"
 filesdir="${rootdir}/serverfiles"
 systemdir="${filesdir}/dod"
 systemdir="${filesdir}/dod"
 executabledir="${filesdir}"
 executabledir="${filesdir}"

+ 2 - 2
DayOfDefeatSource/dodsserver

@@ -3,7 +3,7 @@
 # Server Management Script
 # Server Management Script
 # Author: Daniel Gibbs
 # Author: Daniel Gibbs
 # Website: http://danielgibbs.co.uk
 # Website: http://danielgibbs.co.uk
-# Version: 220614
+# Version: 010814
 
 
 #### Variables ####
 #### Variables ####
 
 
@@ -42,7 +42,7 @@ engine="source"
 # Directorys
 # Directorys
 rootdir="$(cd "$(dirname "${BASH_SOURCE[0]}" )" && pwd )"
 rootdir="$(cd "$(dirname "${BASH_SOURCE[0]}" )" && pwd )"
 selfname="$0"
 selfname="$0"
-lockselfname=$(echo "${selfname}.lock"|sed 's/^\(.\{1\}\).\(.*\)/\1\2/')
+lockselfname=$(echo ".${servicename}.lock")
 filesdir="${rootdir}/serverfiles"
 filesdir="${rootdir}/serverfiles"
 systemdir="${filesdir}/dod"
 systemdir="${filesdir}/dod"
 executabledir="${filesdir}"
 executabledir="${filesdir}"

+ 2 - 2
FistfulOfFrags/fofserver

@@ -3,7 +3,7 @@
 # Server Management Script
 # Server Management Script
 # Author: Daniel Gibbs
 # Author: Daniel Gibbs
 # Website: http://danielgibbs.co.uk
 # Website: http://danielgibbs.co.uk
-# Version: 220614
+# Version: 010814
 
 
 #### Variables ####
 #### Variables ####
 
 
@@ -42,7 +42,7 @@ engine="source"
 # Directorys
 # Directorys
 rootdir="$(cd "$(dirname "${BASH_SOURCE[0]}" )" && pwd )"
 rootdir="$(cd "$(dirname "${BASH_SOURCE[0]}" )" && pwd )"
 selfname="$0"
 selfname="$0"
-lockselfname=$(echo "${selfname}.lock"|sed 's/^\(.\{1\}\).\(.*\)/\1\2/')
+lockselfname=$(echo ".${servicename}.lock")
 filesdir="${rootdir}/serverfiles"
 filesdir="${rootdir}/serverfiles"
 systemdir="${filesdir}/fof"
 systemdir="${filesdir}/fof"
 executabledir="${filesdir}"
 executabledir="${filesdir}"

+ 2 - 2
GarrysMod/gmodserver

@@ -3,7 +3,7 @@
 # Server Management Script
 # Server Management Script
 # Author: Daniel Gibbs
 # Author: Daniel Gibbs
 # Website: http://danielgibbs.co.uk
 # Website: http://danielgibbs.co.uk
-# Version: 220614
+# Version: 010814
 
 
 #### Variables ####
 #### Variables ####
 
 
@@ -47,7 +47,7 @@ engine="source"
 # Directorys
 # Directorys
 rootdir="$(cd "$(dirname "${BASH_SOURCE[0]}" )" && pwd )"
 rootdir="$(cd "$(dirname "${BASH_SOURCE[0]}" )" && pwd )"
 selfname="$0"
 selfname="$0"
-lockselfname=$(echo "${selfname}.lock"|sed 's/^\(.\{1\}\).\(.*\)/\1\2/')
+lockselfname=$(echo ".${servicename}.lock")
 filesdir="${rootdir}/serverfiles"
 filesdir="${rootdir}/serverfiles"
 systemdir="${filesdir}/garrysmod"
 systemdir="${filesdir}/garrysmod"
 executabledir="${filesdir}"
 executabledir="${filesdir}"

+ 2 - 2
HalfLife2Deathmatch/hl2dmserver

@@ -3,7 +3,7 @@
 # Server Management Script
 # Server Management Script
 # Author: Daniel Gibbs
 # Author: Daniel Gibbs
 # Website: http://danielgibbs.co.uk
 # Website: http://danielgibbs.co.uk
-# Version: 220614
+# Version: 010814
 
 
 #### Variables ####
 #### Variables ####
 
 
@@ -42,7 +42,7 @@ engine="source"
 # Directorys
 # Directorys
 rootdir="$(cd "$(dirname "${BASH_SOURCE[0]}" )" && pwd )"
 rootdir="$(cd "$(dirname "${BASH_SOURCE[0]}" )" && pwd )"
 selfname="$0"
 selfname="$0"
-lockselfname=$(echo "${selfname}.lock"|sed 's/^\(.\{1\}\).\(.*\)/\1\2/')
+lockselfname=$(echo ".${servicename}.lock")
 filesdir="${rootdir}/serverfiles"
 filesdir="${rootdir}/serverfiles"
 systemdir="${filesdir}/hl2mp"
 systemdir="${filesdir}/hl2mp"
 executabledir="${filesdir}"
 executabledir="${filesdir}"

+ 2 - 2
HalfLifeDeathmatchClassic/hldmcserver

@@ -3,7 +3,7 @@
 # Server Management Script
 # Server Management Script
 # Author: Daniel Gibbs
 # Author: Daniel Gibbs
 # Website: http://danielgibbs.co.uk
 # Website: http://danielgibbs.co.uk
-# Version: 220614
+# Version: 010814
 
 
 #### Variables ####
 #### Variables ####
 
 
@@ -41,7 +41,7 @@ engine="goldsource"
 # Directorys
 # Directorys
 rootdir="$(cd "$(dirname "${BASH_SOURCE[0]}" )" && pwd )"
 rootdir="$(cd "$(dirname "${BASH_SOURCE[0]}" )" && pwd )"
 selfname="$0"
 selfname="$0"
-lockselfname=$(echo "${selfname}.lock"|sed 's/^\(.\{1\}\).\(.*\)/\1\2/')
+lockselfname=$(echo ".${servicename}.lock")
 filesdir="${rootdir}/serverfiles"
 filesdir="${rootdir}/serverfiles"
 systemdir="${filesdir}/valve"
 systemdir="${filesdir}/valve"
 executabledir="${filesdir}"
 executabledir="${filesdir}"

+ 2 - 2
Insurgency/insserver

@@ -3,7 +3,7 @@
 # Server Management Script
 # Server Management Script
 # Author: Daniel Gibbs
 # Author: Daniel Gibbs
 # Website: http://danielgibbs.co.uk
 # Website: http://danielgibbs.co.uk
-# Version: 220614
+# Version: 010814
 
 
 #### Variables ####
 #### Variables ####
 
 
@@ -42,7 +42,7 @@ engine="source"
 # Directorys
 # Directorys
 rootdir="$(cd "$(dirname "${BASH_SOURCE[0]}" )" && pwd )"
 rootdir="$(cd "$(dirname "${BASH_SOURCE[0]}" )" && pwd )"
 selfname="$0"
 selfname="$0"
-lockselfname=$(echo "${selfname}.lock"|sed 's/^\(.\{1\}\).\(.*\)/\1\2/')
+lockselfname=$(echo ".${servicename}.lock")
 filesdir="${rootdir}/serverfiles"
 filesdir="${rootdir}/serverfiles"
 systemdir="${filesdir}/insurgency"
 systemdir="${filesdir}/insurgency"
 executabledir="${filesdir}"
 executabledir="${filesdir}"

+ 2 - 2
KillingFloor/kfserver

@@ -3,7 +3,7 @@
 # Server Management Script
 # Server Management Script
 # Author: Daniel Gibbs
 # Author: Daniel Gibbs
 # Website: http://danielgibbs.co.uk
 # Website: http://danielgibbs.co.uk
-# Version: 220614
+# Version: 010814
 
 
 #### Variables ####
 #### Variables ####
 
 
@@ -22,7 +22,7 @@ appid="215360"
 # Directorys
 # Directorys
 rootdir="$(cd "$(dirname "${BASH_SOURCE[0]}" )" && pwd )"
 rootdir="$(cd "$(dirname "${BASH_SOURCE[0]}" )" && pwd )"
 selfname="$0"
 selfname="$0"
-lockselfname=$(echo "${selfname}.lock"|sed 's/^\(.\{1\}\).\(.*\)/\1\2/')
+lockselfname=$(echo ".${servicename}.lock")
 filesdir="${rootdir}/serverfiles"
 filesdir="${rootdir}/serverfiles"
 systemdir="${filesdir}/System"
 systemdir="${filesdir}/System"
 executabledir="${systemdir}"
 executabledir="${systemdir}"

+ 2 - 2
Left4Dead2/l4d2server

@@ -3,7 +3,7 @@
 # Server Management Script
 # Server Management Script
 # Author: Daniel Gibbs
 # Author: Daniel Gibbs
 # Website: http://danielgibbs.co.uk
 # Website: http://danielgibbs.co.uk
-# Version: 220614
+# Version: 010814
 
 
 #### Variables ####
 #### Variables ####
 
 
@@ -41,7 +41,7 @@ engine="source"
 # Directorys
 # Directorys
 rootdir="$(cd "$(dirname "${BASH_SOURCE[0]}" )" && pwd )"
 rootdir="$(cd "$(dirname "${BASH_SOURCE[0]}" )" && pwd )"
 selfname="$0"
 selfname="$0"
-lockselfname=$(echo "${selfname}.lock"|sed 's/^\(.\{1\}\).\(.*\)/\1\2/')
+lockselfname=$(echo ".${servicename}.lock")
 filesdir="${rootdir}/serverfiles"
 filesdir="${rootdir}/serverfiles"
 systemdir="${filesdir}/left4dead2"
 systemdir="${filesdir}/left4dead2"
 executabledir="${filesdir}"
 executabledir="${filesdir}"

+ 2 - 2
NaturalSelection2/ns2server

@@ -3,7 +3,7 @@
 # Server Management Script
 # Server Management Script
 # Author: Daniel Gibbs
 # Author: Daniel Gibbs
 # Website: http://danielgibbs.co.uk
 # Website: http://danielgibbs.co.uk
-# Version: 220614
+# Version: 010814
 
 
 #### Variables ####
 #### Variables ####
 
 
@@ -45,7 +45,7 @@ engine="spark"
 
 
 # Directories
 # Directories
 selfname="$0"
 selfname="$0"
-lockselfname=$(echo "${selfname}.lock"|sed 's/^\(.\{1\}\).\(.*\)/\1\2/')
+lockselfname=$(echo ".${servicename}.lock")
 filesdir="${rootdir}/serverfiles"
 filesdir="${rootdir}/serverfiles"
 systemdir="${filesdir}"
 systemdir="${filesdir}"
 executabledir="${filesdir}"
 executabledir="${filesdir}"

+ 2 - 1
NoMoreRoomInHell/nmrihserver

@@ -3,7 +3,7 @@
 # Server Management Script
 # Server Management Script
 # Author: Daniel Gibbs
 # Author: Daniel Gibbs
 # Website: http://danielgibbs.co.uk
 # Website: http://danielgibbs.co.uk
-# Version: 220614
+# Version: 010814
 
 
 #### Variables ####
 #### Variables ####
 
 
@@ -41,6 +41,7 @@ engine="source"
 # Directorys
 # Directorys
 rootdir="$(cd "$(dirname "${BASH_SOURCE[0]}" )" && pwd )"
 rootdir="$(cd "$(dirname "${BASH_SOURCE[0]}" )" && pwd )"
 selfname="$0"
 selfname="$0"
+lockselfname=$(echo ".${servicename}.lock")
 filesdir="${rootdir}/serverfiles"
 filesdir="${rootdir}/serverfiles"
 systemdir="${filesdir}/nmrih"
 systemdir="${filesdir}/nmrih"
 executabledir="${filesdir}/srcds"
 executabledir="${filesdir}/srcds"

+ 2 - 2
RedOrchestra/roserver

@@ -3,7 +3,7 @@
 # Server Management Script
 # Server Management Script
 # Author: Daniel Gibbs
 # Author: Daniel Gibbs
 # Website: http://danielgibbs.co.uk
 # Website: http://danielgibbs.co.uk
-# Version: 220614
+# Version: 010814
 
 
 #### Variables ####
 #### Variables ####
 
 
@@ -22,7 +22,7 @@ appid="223250"
 # Directorys
 # Directorys
 rootdir="$(cd "$(dirname "${BASH_SOURCE[0]}" )" && pwd )"
 rootdir="$(cd "$(dirname "${BASH_SOURCE[0]}" )" && pwd )"
 selfname="$0"
 selfname="$0"
-lockselfname=$(echo "${selfname}.lock"|sed 's/^\(.\{1\}\).\(.*\)/\1\2/')
+lockselfname=$(echo ".${servicename}.lock")
 filesdir="${rootdir}/serverfiles"
 filesdir="${rootdir}/serverfiles"
 systemdir="${filesdir}/system"
 systemdir="${filesdir}/system"
 executabledir="${systemdir}"
 executabledir="${systemdir}"

+ 2 - 2
TeamFortress2/tf2server

@@ -3,7 +3,7 @@
 # Server Management Script
 # Server Management Script
 # Author: Daniel Gibbs
 # Author: Daniel Gibbs
 # Website: http://danielgibbs.co.uk
 # Website: http://danielgibbs.co.uk
-# Version: 220614
+# Version: 010814
 
 
 #### Variables ####
 #### Variables ####
 
 
@@ -42,7 +42,7 @@ engine="source"
 # Directorys
 # Directorys
 rootdir="$(cd "$(dirname "${BASH_SOURCE[0]}" )" && pwd )"
 rootdir="$(cd "$(dirname "${BASH_SOURCE[0]}" )" && pwd )"
 selfname="$0"
 selfname="$0"
-lockselfname=$(echo "${selfname}.lock"|sed 's/^\(.\{1\}\).\(.*\)/\1\2/')
+lockselfname=$(echo ".${servicename}.lock")
 filesdir="${rootdir}/serverfiles"
 filesdir="${rootdir}/serverfiles"
 systemdir="${filesdir}/tf"
 systemdir="${filesdir}/tf"
 executabledir="${filesdir}"
 executabledir="${filesdir}"

+ 2 - 2
TeamFortressClassic/tfcserver

@@ -3,7 +3,7 @@
 # Server Management Script
 # Server Management Script
 # Author: Daniel Gibbs
 # Author: Daniel Gibbs
 # Website: http://danielgibbs.co.uk
 # Website: http://danielgibbs.co.uk
-# Version: 220614
+# Version: 010814
 
 
 #### Variables ####
 #### Variables ####
 
 
@@ -41,7 +41,7 @@ engine="goldsource"
 # Directorys
 # Directorys
 rootdir="$(cd "$(dirname "${BASH_SOURCE[0]}" )" && pwd )"
 rootdir="$(cd "$(dirname "${BASH_SOURCE[0]}" )" && pwd )"
 selfname="$0"
 selfname="$0"
-lockselfname=$(echo "${selfname}.lock"|sed 's/^\(.\{1\}\).\(.*\)/\1\2/')
+lockselfname=$(echo ".${servicename}.lock")
 filesdir="${rootdir}/serverfiles"
 filesdir="${rootdir}/serverfiles"
 systemdir="${filesdir}/tfc"
 systemdir="${filesdir}/tfc"
 executabledir="${filesdir}"
 executabledir="${filesdir}"

+ 2 - 2
UnrealTournament2004/ut2k4server

@@ -3,7 +3,7 @@
 # Server Management Script
 # Server Management Script
 # Author: Daniel Gibbs
 # Author: Daniel Gibbs
 # Website: http://danielgibbs.co.uk
 # Website: http://danielgibbs.co.uk
-# Version: 220614
+# Version: 010814
 
 
 #### Variables ####
 #### Variables ####
 
 
@@ -15,7 +15,7 @@ email="email@example.com"
 # Directorys
 # Directorys
 rootdir="$(cd "$(dirname "${BASH_SOURCE[0]}" )" && pwd )"
 rootdir="$(cd "$(dirname "${BASH_SOURCE[0]}" )" && pwd )"
 selfname="$0"
 selfname="$0"
-lockselfname=$(echo "${selfname}.lock"|sed 's/^\(.\{1\}\).\(.*\)/\1\2/')
+lockselfname=$(echo ".${servicename}.lock")
 filesdir="${rootdir}/serverfiles"
 filesdir="${rootdir}/serverfiles"
 systemdir="${filesdir}/System"
 systemdir="${filesdir}/System"
 executabledir="${systemdir}"
 executabledir="${systemdir}"

+ 1 - 1
UnrealTournament99/ut99server

@@ -3,7 +3,7 @@
 # Server Management Script
 # Server Management Script
 # Author: Daniel Gibbs
 # Author: Daniel Gibbs
 # Website: http://danielgibbs.co.uk
 # Website: http://danielgibbs.co.uk
-# Version: 220614
+# Version: 010814
 
 
 #### Variables ####
 #### Variables ####