Changeset 39

Timestamp:

Jun 2, 2014, 1:39:16 PM (11 years ago)

Author:

alloc

Message:

Minor bootstrapper changes

Files:

• bootstrapper/bootstrap.sh (modified) (1 diff)
• scripts/usr/local/lib/7dtd/commands/start.sh (modified) (1 diff)

bootstrapper/bootstrap.sh

@@ -95 +95 @@
 
 checkSetupDeps() {
-        which gcc > /dev/null
-        if [ $? -ne 0 ]; then
-                echo "'gcc' not installed. Please install it and run this script again."
-                exit 1
-        fi
-
-        which wget > /dev/null
-        if [ $? -ne 0 ]; then
-                echo "'wget' not installed. Please install it and run this script again."
-                exit 1
-        fi
-
-        which tr > /dev/null
-        if [ $? -ne 0 ]; then
-                echo "'tr' not installed. Please install it and run this script again."
-                exit 1
-        fi
+        for DEP in "gcc wget tr rsync xmlstarlet"; do
+                which $DEP > /dev/null
+                if [ $? -ne 0 ]; then
+                        echo "\"$DEP\" not installed. Please install it and run this script again."
+                        exit 1
+                fi
+        done
         
         ldconfig -p | grep gcc | grep -v 64 > /dev/null

scripts/usr/local/lib/7dtd/commands/start.sh

@@ -21 +21 @@
         if [ $(isRunning $1) -eq 0 ]; then
                 setAllPlayersOffline $1
-                rm $(getInstancePath $1)/output_log.txt
+                rm -f $(getInstancePath $1)/output_log.txt
                 
                 for H in $(getHooksFor serverPreStart); do