From c82d123c28885295934820ef56feaa43d88095e5 Mon Sep 17 00:00:00 2001
From: Philip Trauner <philip.trauner@arztpraxis.io>
Date: Mon, 9 Apr 2018 19:37:08 +0200
Subject: [PATCH] Removed ONESHELL hack and instead created two seperate
 scripts

---
 Makefile   | 56 ++++--------------------------------------------------
 combine.sh | 42 ++++++++++++++++++++++++++++++++++++++++
 prepare.sh | 16 ++++++++++++++++
 3 files changed, 62 insertions(+), 52 deletions(-)
 create mode 100755 combine.sh
 create mode 100755 prepare.sh

diff --git a/Makefile b/Makefile
index 50ca33c..5cc3a68 100644
--- a/Makefile
+++ b/Makefile
@@ -1,57 +1,9 @@
 .PHONY: all setup build
-all: build combine
+all: build
 
 setup:
-	./scripts/setup-host.sh
+	sudo ./scripts/setup-host.sh
 
-.ONESHELL:
 build: 
-	set -e
-
-	mkdir -p build
-
-	cd scripts
-
-	./setup-root-fs.sh
-	sudo ./make-sd-card.sh
-	./linux-dtbs.sh
-	sudo ./debian.sh
-
-.ONESHELL:
-combine:
-	set -e
-
-	mkdir -p mnt
-	mkdir -p mnt/boot
-	mkdir -p mnt/rootfs
-
-	echo "Mounting 0s"
-	sudo kpartx -a build/0s.img
-
-	cd mnt
-
-	sudo mount /dev/mapper/loop0p1 boot
-	sudo mount /dev/mapper/loop0p2 rootfs
-
-	sleep 1
-
-	echo "Copying bootloader"
-	sudo cp ../boot/* boot
-	echo "Copying Debian"
-	sudo cp -rp ../build/debian/* rootfs
-	echo "Copying dtbs"
-	sudo cp -r ../build/linux/* rootfs
-
-	sleep 1
-
-	sudo umount boot
-	sudo umount rootfs
-
-	sleep 1
-
-	cd ..
-
-	echo "Unmounting 0s"
-	sudo kpartx -d build/0s.img
-	sudo kpartx -d /dev/loop0
-	sudo losetup -d /dev/loop0
\ No newline at end of file
+	./prepare.sh
+	./combine.sh
\ No newline at end of file
diff --git a/combine.sh b/combine.sh
new file mode 100755
index 0000000..d1989f0
--- /dev/null
+++ b/combine.sh
@@ -0,0 +1,42 @@
+#!/bin/bash
+
+set -e
+set -x
+
+sudo -v
+while true; do sudo -n true; sleep 60; kill -0 \"$$\" || exit; done 2>/dev/null & 
+
+mkdir -p mnt
+mkdir -p mnt/boot
+mkdir -p mnt/rootfs
+
+echo "Mounting 0s"
+sudo kpartx -a build/0s.img
+
+cd mnt
+
+sudo mount /dev/mapper/loop0p1 boot
+sudo mount /dev/mapper/loop0p2 rootfs
+
+sleep 1
+
+echo "Copying bootloader"
+sudo cp ../boot/* boot
+echo "Copying Debian"
+sudo cp -rp ../build/debian/* rootfs
+echo "Copying dtbs"
+sudo cp -r ../build/linux/* rootfs
+
+sleep 1
+
+sudo umount boot
+sudo umount rootfs
+
+sleep 1
+
+cd ..
+
+echo "Unmounting 0s"
+sudo kpartx -d build/0s.img
+sudo kpartx -d /dev/loop0
+sudo losetup -d /dev/loop0
\ No newline at end of file
diff --git a/prepare.sh b/prepare.sh
new file mode 100755
index 0000000..42d9209
--- /dev/null
+++ b/prepare.sh
@@ -0,0 +1,16 @@
+#!/bin/bash
+
+set -e
+set -x
+
+sudo -v
+while true; do sudo -n true; sleep 60; kill -0 \"$$\" || exit; done 2>/dev/null & 
+
+mkdir -p build
+
+cd scripts
+
+./setup-root-fs.sh
+sudo ./make-sd-card.sh
+./linux-dtbs.sh
+sudo ./debian.sh
\ No newline at end of file