Changeset 39


Ignore:
Timestamp:
Jun 2, 2014, 1:39:16 PM (8 years ago)
Author:
alloc
Message:

Minor bootstrapper changes

Files:
2 edited

Legend:

Unmodified
Added
Removed
  • bootstrapper/bootstrap.sh

    r38 r39  
    9595
    9696checkSetupDeps() {
    97         which gcc > /dev/null
    98         if [ $? -ne 0 ]; then
    99                 echo "'gcc' not installed. Please install it and run this script again."
    100                 exit 1
    101         fi
    102 
    103         which wget > /dev/null
    104         if [ $? -ne 0 ]; then
    105                 echo "'wget' not installed. Please install it and run this script again."
    106                 exit 1
    107         fi
    108 
    109         which tr > /dev/null
    110         if [ $? -ne 0 ]; then
    111                 echo "'tr' not installed. Please install it and run this script again."
    112                 exit 1
    113         fi
     97        for DEP in "gcc wget tr rsync xmlstarlet"; do
     98                which $DEP > /dev/null
     99                if [ $? -ne 0 ]; then
     100                        echo "\"$DEP\" not installed. Please install it and run this script again."
     101                        exit 1
     102                fi
     103        done
    114104       
    115105        ldconfig -p | grep gcc | grep -v 64 > /dev/null
  • scripts/usr/local/lib/7dtd/commands/start.sh

    r36 r39  
    2121        if [ $(isRunning $1) -eq 0 ]; then
    2222                setAllPlayersOffline $1
    23                 rm $(getInstancePath $1)/output_log.txt
     23                rm -f $(getInstancePath $1)/output_log.txt
    2424               
    2525                for H in $(getHooksFor serverPreStart); do
Note: See TracChangeset for help on using the changeset viewer.