From 8550bd607231d7f693dfe7dfe6716165e6b5cb54 Mon Sep 17 00:00:00 2001
From: parazyd <parazyd@dyne.org>
Date: Sun, 18 Dec 2016 14:47:23 +0100
Subject: [PATCH] allow for multiple scripts in chroot-script

---
 config          |  2 +-
 libdevuansdk    |  2 +-
 zlibs/bootstrap |  5 ++---
 zlibs/helpers   | 36 +++++++++++++++++++++---------------
 4 files changed, 25 insertions(+), 20 deletions(-)

diff --git a/config b/config
index c873741..f7443e6 100644
--- a/config
+++ b/config
@@ -24,7 +24,7 @@ arrs+=(core_packages base_packages purge_packages blend_packages)
 
 os="devuan"
 release="jessie"
-version="1.0.0-beta2.rc1"
+version="1.0.0-beta2"
 mirror="http://auto.mirror.devuan.org/merged"
 section="main"
 
diff --git a/libdevuansdk b/libdevuansdk
index df78317..6293971 100644
--- a/libdevuansdk
+++ b/libdevuansdk
@@ -17,7 +17,7 @@
 # You should have received a copy of the GNU General Public License
 # along with this source code. If not, see <http://www.gnu.org/licenses/>.
 
-libdevuansdk_version="0.2"
+libdevuansdk_version="0.3"
 LIBPATH=${LIBPATH:-`dirname $0`}
 
 source $LIBPATH/config
diff --git a/zlibs/bootstrap b/zlibs/bootstrap
index c561981..0570bc3 100644
--- a/zlibs/bootstrap
+++ b/zlibs/bootstrap
@@ -70,8 +70,7 @@ bootstrap_complete_base() {
 
 	devprocsys mount $strapdir || zerr
 
-	chroot-script -d thirdstage || zerr
-	chroot-script -d cleanup    || zerr
+	chroot-script -d thirdstage cleanup || zerr
 
 	sleep 1
 	devprocsys umount $strapdir || zerr
@@ -90,7 +89,7 @@ rm -f /thirdstage
 rm -f /etc/ssh/*_key
 rm -f /etc/ssh/*.pub
 rm -f /root/.bash_history
-rm -f /usr/bin/qemu-arm-static
+#rm -f /usr/bin/qemu-arm-static
 ## our file for which we check the bootstrap is complete
 echo "1" > .done
 rm -f /cleanup
diff --git a/zlibs/helpers b/zlibs/helpers
index 5d632cf..3925b1a 100644
--- a/zlibs/helpers
+++ b/zlibs/helpers
@@ -249,23 +249,29 @@ EOF
 chroot-script() {
 	fn chroot-script "$@"
 
-	notice "chrooting for script $@"
+	case "x$1" in
+		x-d)
+			shift 1
+			local scripts="$@"
 
-	if [[ "$1" == "-d" ]]; then
-		shift 1
-		local _script="$1"
-
-		dpkgdivert on $strapdir
-		sudo chmod +x $strapdir/$_script
-		sudo -E chroot $strapdir /$_script
-		dpkgdivert off $strapdir
-	else
-		local _script="$1"
-
-		sudo chmod +x $strapdir/$_script
-		sudo -E chroot $strapdir /$_script
-	fi
+			dpkgdivert on $strapdir
+			for i in $scripts; do
+				notice "chrooting to execute $i..."
+				sudo chmod +x $strapdir/$i
+				sudo -E chroot $strapdir /$i
+			done
+			dpkgdivert off $strapdir
+			;;
+		*)
+			local scripts="$@"
 
+			for i in $scripts; do
+				notice "chrooting to execute $i..."
+				sudo chmod +x $strapdir/$i
+				sudo -E chroot $strapdir /$i
+			done
+			;;
+	esac
 }
 
 silly() {