Changeset 57 for scripts/usr

Timestamp:

Jun 9, 2014, 3:11:45 PM (11 years ago)

Author:

alloc

Message:

Version 16: Fixes #17

Location:

scripts/usr/local/lib/7dtd

Files:

• VERSION (modified) (1 diff)
• monitor-log.sh (modified) (1 diff)

scripts/usr/local/lib/7dtd/VERSION

@@ -1 @@
-Version: 15
+Version: 16
 Release: 2014-06-09

scripts/usr/local/lib/7dtd/monitor-log.sh

@@ -58 +58 @@
                 echo "$(timestamp): $line" >> $LOG
                 if [ -n "$(echo "$line" | grep '^RequestToSpawnPlayer:')" ]; then
-                        read entityId playerId playerName unknown <<< "$(echo $line | sed -r 's/^RequestToSpawnPlayer: (.*), (.*), (.*), (.*)$/\1 \2 \3 \4/')"
+                        entityId=$(expr "$line" : 'RequestToSpawnPlayer: \([0-9]*\), [0-9]*, .*, [0-9]*$')
+                        playerId=$(expr "$line" : 'RequestToSpawnPlayer: [0-9]*, \([0-9]*\), .*, [0-9]*$')
+                        playerName=$(expr "$line" : 'RequestToSpawnPlayer: [0-9]*, [0-9]*, \(.*\), [0-9]*$')
+                        unknown=$(expr "$line" : 'RequestToSpawnPlayer: [0-9]*, [0-9]*, .*, \([0-9]*\)$')
                         sleep 1
-                        handleConnect $playerId $entityId $playerName
+                        handleConnect "$playerId" "$entityId" "$playerName"
                         unset entityId playerId playerName unknown
                 fi
                 if [ -n "$(echo "$line" | grep '^Removing player with id ')" ]; then
-                        read playerId entityId <<< "$(echo $line | sed -r 's/^Removing player with id clientId=(.*), entityId=(.*)$/\1 \2/')"
-                        handleDisconnect $playerId $entityId
+                        playerId=$(expr "$line" : 'Removing player with id clientId=\([0-9]*\), entityId=[0-9]*$')
+                        entityId=$(expr "$line" : 'Removing player with id clientId=[0-9]*, entityId=\([0-9]*\)$')
+                        handleDisconnect "$playerId" "$entityId"
                         unset playerId entityId
                 fi