From 05e276c43a8ed3c95f30b88a4e9a1f7533f12174 Mon Sep 17 00:00:00 2001
From: Rik Veenboer <rik.veenboer@gmail.com>
Date: Wed, 20 Apr 2016 22:25:43 +0100
Subject: [PATCH] Make using multiple cores, add/move cleanup

---
 build/scripts/lighttpd.sh   | 11 +++++++++--
 build/scripts/php.sh        | 16 ++++++++--------
 build/scripts/phpmyadmin.sh | 11 ++++++-----
 3 files changed, 23 insertions(+), 15 deletions(-)

diff --git a/build/scripts/lighttpd.sh b/build/scripts/lighttpd.sh
index 1f9520a..1e7c93c 100755
--- a/build/scripts/lighttpd.sh
+++ b/build/scripts/lighttpd.sh
@@ -22,10 +22,17 @@ sed -i "s,\(pwd->pw_uid\s==\s\)0,\1-1," server.c
 sed -i "s,\(grp->gr_gid\s==\s\)0,\1-1," server.c
 cd ..
 ./configure --with-openssl
-make
+make $JOBS
 make install
 
 ## Configuration
 sed -i "s,^\(server.errorlog\s*=\s*\).*$,\1\"$LIGHTTPD_LOG\"," $LIGHTTPD_CONFIG
 sed -i "s,^\(server.username\s*=\s*\).*$,\1\"root\"," $LIGHTTPD_CONFIG
-sed -i "s,^\(server.groupname\s*=\s*\).*$,\1\"root\"," $LIGHTTPD_CONFIG
\ No newline at end of file
+sed -i "s,^\(server.groupname\s*=\s*\).*$,\1\"root\"," $LIGHTTPD_CONFIG
+
+## Remove installation files
+if [ $MODE == "minimal" ]; then
+    cd /opt
+    rm -r lighttpd-$LIGHTTPD_VERSION
+    rm lighttpd-$LIGHTTPD_VERSION.tar.gz
+fi
diff --git a/build/scripts/php.sh b/build/scripts/php.sh
index 5bc8922..09e506d 100755
--- a/build/scripts/php.sh
+++ b/build/scripts/php.sh
@@ -17,17 +17,17 @@ wget http://uk1.php.net/get/php-$PHP_VERSION.tar.gz/from/this/mirror -O  php-$PH
 tar xzf php-$PHP_VERSION.tar.gz
 cd php-$PHP_VERSION
 ./configure --enable-calendar --enable-bcmath --with-bz2 --enable-ctype --without-gdbm --with-iconv --enable-exif --enable-ftp --with-gettext --enable-mbstring --enable-sockets --with-zlib --enable-soap --enable-zip --with-mhash --with-curl --with-gd --with-mysql --with-jpeg-dir --with-openssl --with-mysqli --with-mcrypt
-make
+make $JOBS
 make install
 
-## Remove installation files
-if [ $MODE == "minimal" ]; then
-    cd ..
-    rm -r php-$PHP_VERSION
-    rm php-$PHP_VERSION.tar.gz
-fi
-
 ## Configuration
 cp /opt/php-$PHP_VERSION/php.ini-production $PHP_CONFIG
 sed -i "s,^;\(date\.timezone\s*=\s*\)$,\1 $PHP_TIMEZONE," $PHP_CONFIG
 ln -s /usr/local/bin/php-cgi /usr/bin/php-cgi
+
+## Remove installation files
+if [ $MODE == "minimal" ]; then
+    cd /opt
+    rm -r php-$PHP_VERSION
+    rm php-$PHP_VERSION.tar.gz
+fi
\ No newline at end of file
diff --git a/build/scripts/phpmyadmin.sh b/build/scripts/phpmyadmin.sh
index ba9f9b7..5445fa2 100755
--- a/build/scripts/phpmyadmin.sh
+++ b/build/scripts/phpmyadmin.sh
@@ -14,11 +14,6 @@ mv phpMyAdmin-$PMA_VERSION-*/ phpMyAdmin-$PMA_VERSION/
 rm -r $PMA_ROOT/../*
 ln -s /opt/phpMyAdmin-$PMA_VERSION $PMA_ROOT
 
-## Remove installation files
-if [ $MODE == "minimal" ]; then
-    rm phpMyAdmin-$PMA_VERSION.tar.gz
-fi
-
 ## Configuration
 cat << EOF > $PMA_CONFIG
 <?php
@@ -30,3 +25,9 @@ cat << EOF > $PMA_CONFIG
 \$cfg['Servers'][1]['extension'] = 'mysqli';
 \$cfg['Servers'][1]['AllowNoPassword'] = true;
 EOF
+
+## Remove installation files
+if [ $MODE == "minimal" ]; then
+    cd /opt
+    rm phpMyAdmin-$PMA_VERSION-all-languages.tar.gz
+fi