Changeset 71 for scripts

Timestamp:

Jul 12, 2014, 4:09:13 PM (10 years ago)

Author:

alloc

Message:

v.29: Another fix for player logging

Location:

scripts/usr/local/lib/7dtd

Files:

• VERSION (modified) (1 diff)
• playerlog.sh (modified) (8 diffs)

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

@@ -1 @@
-Version: 28
+Version: 29
 Release: 2014-07-12

scripts/usr/local/lib/7dtd/playerlog.sh

@@ -10 +10 @@
 # Create empty player list if not existing
 createPlayerList() {
-        if [ ! -f $PLAYERSXML ]; then
+        if [ ! -f "$PLAYERSXML" ]; then
+                echo "<Players/>" > $PLAYERSXML
+        fi
+        if [ -z "$(cat $PLAYERSXML)" ]; then
                 echo "<Players/>" > $PLAYERSXML
         fi
@@ -20 +23 @@
         $XMLSTARLET ed -L \
                 -u "/Players/Player/@online" -v "false" \
-                $PLAYERSXML
+                "$PLAYERSXML"
 }
 
@@ -34 +37 @@
         NICKNAME="$4"
 
-        echo "$(timestamp) +++ $ENTITYID $NICKNAME $STEAMID" >> $PLAYERSLOG
+        echo "$(timestamp) +++ $ENTITYID $NICKNAME $STEAMID" >> "$PLAYERSLOG"
 
         createPlayerList
@@ -40 +43 @@
         XPATHBASE="/Players/Player[@steamid='$STEAMID']"
 
-        if [ -z $($XMLSTARLET sel -t -v "$XPATHBASE/@steamid" $PLAYERSXML) ]; then
+        if [ -z $($XMLSTARLET sel -t -v "$XPATHBASE/@steamid" "$PLAYERSXML") ]; then
                 $XMLSTARLET ed -L \
                         -s "/Players" -t elem -n "Player" -v "" \
@@ -50 +53 @@
                         -i "$XPATHBASE" -t attr -n "online" -v "true" \
                         -i "$XPATHBASE" -t attr -n "entityid" -v "$ENTITYID" \
-                        $PLAYERSXML
+                        "$PLAYERSXML"
         else
-                LOGINS=$($XMLSTARLET sel -t -v "$XPATHBASE/@logins" $PLAYERSXML)
+                LOGINS=$($XMLSTARLET sel -t -v "$XPATHBASE/@logins" "$PLAYERSXML")
                 (( LOGINS++ ))
                 $XMLSTARLET ed -L \
@@ -59 +62 @@
                         -u "$XPATHBASE/@entityid" -v "$ENTITYID" \
                         -u "$XPATHBASE/@logins" -v "$LOGINS" \
-                        $PLAYERSXML
+                        "$PLAYERSXML"
         fi
 }
@@ -75 +78 @@
 
         if [ -f $PLAYERSXML ]; then
-                if [ ! -z $($XMLSTARLET sel -t -v "$XPATHBASE/@steamid" $PLAYERSXML) ]; then
-                        NICKNAME=$($XMLSTARLET sel -t -v "$XPATHBASE/@nick" $PLAYERSXML)
-                        STEAMID=$($XMLSTARLET sel -t -v "$XPATHBASE/@steamid" $PLAYERSXML)
-                        LOGINTIME=$($XMLSTARLET sel -t -v "$XPATHBASE/@lastlogin" $PLAYERSXML)
-                        PLAYTIME=$($XMLSTARLET sel -t -v "$XPATHBASE/@playtime" $PLAYERSXML)
+                if [ ! -z $($XMLSTARLET sel -t -v "$XPATHBASE/@steamid" "$PLAYERSXML") ]; then
+                        NICKNAME=$($XMLSTARLET sel -t -v "$XPATHBASE/@nick" "$PLAYERSXML")
+                        STEAMID=$($XMLSTARLET sel -t -v "$XPATHBASE/@steamid" "$PLAYERSXML")
+                        LOGINTIME=$($XMLSTARLET sel -t -v "$XPATHBASE/@lastlogin" "$PLAYERSXML")
+                        PLAYTIME=$($XMLSTARLET sel -t -v "$XPATHBASE/@playtime" "$PLAYERSXML")
                         NOW=$(date '+%s')
                         PLAYTIME=$(( PLAYTIME + NOW - LOGINTIME ))
@@ -85 +88 @@
                                 -u "$XPATHBASE/@playtime" -v "$PLAYTIME" \
                                 -u "$XPATHBASE/@online" -v "false" \
-                                $PLAYERSXML
+                                "$PLAYERSXML"
                 fi
         fi
 
-        echo "$(timestamp) --- $ENTITYID $NICKNAME $STEAMID" >> $PLAYERSLOG
+        echo "$(timestamp) --- $ENTITYID $NICKNAME $STEAMID" >> "$PLAYERSLOG"
 }