Changeset 32

Timestamp:

Jun 1, 2014, 4:34:21 PM (11 years ago)

Author:

alloc

Message:

Bootstrapper update

Files:

• bootstrapper/bootstrap.sh (modified) (4 diffs)
• scripts/etc/7dtd.conf (modified) (1 diff)

bootstrapper/bootstrap.sh

@@ -10 +10 @@
 ADDCRONJOBS=0
 RUNINSTALL=0
-
-DEPENDENCIES="xvfb mono-runtime rsync xmlstarlet"
+INSTALLOPTIONALDEPS=0
+
+DEPENDENCIES="gcc wget tr xvfb mono-runtime rsync xmlstarlet gcc"
 
 if [ -n "$(command -v apt-get)" ]; then
@@ -92 +93 @@
 }
 
+checkSetupDeps() {
+        which gcc > /dev/null
+        if [ $? -ne 0 ]; then
+                echo "'gcc' not installed. Please install it and run this script again."
+                echo 0
+                return
+        fi
+
+        which wget > /dev/null
+        if [ $? -ne 0 ]; then
+                echo "'wget' not installed. Please install it and run this script again."
+                echo 0
+                return
+        fi
+
+        which tr > /dev/null
+        if [ $? -ne 0 ]; then
+                echo "'tr' not installed. Please install it and run this script again."
+                echo 0
+                return
+        fi
+
+        echo 1
+}
+
 setupUser() {
         echo -e "Setting up user and group \"sdtd\"\n"
@@ -119 +145 @@
         if [ $ISDEBIAN -eq 1 ]; then
                 update-rc.d 7dtd.sh defaults
-        else
-                echo
-                echo "Compiling start-stop-daemon"
-                cd /usr/local/lib/7dtd/start-stop-daemon
-                make
-                make install
-
-                sed -ir "s/^export SSD=.*$/export SSD=\/usr\/local\/lib\/7dtd\/start-stop-daemon\/start-stop-daemon/" /etc/7dtd.conf
-        fi
+        fi
+        
+        echo
+        echo "Compiling start-stop-daemon"
+        cd /usr/local/lib/7dtd/start-stop-daemon
+
+        gcc -Wall -Wextra -Wno-return-type -o start-stop-daemon start-stop-daemon.c
+        chown root.root start-stop-daemon
+        chmod 0755 start-stop-daemon
+
+#TODO: remove
+        sed -ir "s/^export SSD=.*$/export SSD=\/usr\/local\/lib\/7dtd\/start-stop-daemon\/start-stop-daemon/" /etc/7dtd.conf
+
         echo -e "\n=============================================================\n\n"
 }
@@ -195 +225 @@
                         echo
                 fi
+        else
+                if [ $(checkSetupDeps) -eq 0 ]; then
+                        return
+                fi
         fi
         setupUser

scripts/etc/7dtd.conf

@@ -20 +20 @@
 export XMLSTARLET=/usr/bin/xmlstarlet
 export PKILL=/usr/bin/pkill
-export SSD=/sbin/start-stop-daemon
+export SSD=/usr/local/lib/7dtd/start-stop-daemon/start-stop-daemon