From 7a76cdc71f478f2c0529f4bdf397a8ff1f4de0d2 Mon Sep 17 00:00:00 2001
From: bauen1 <j2468h@gmail.com>
Date: Mon, 13 Nov 2017 21:29:00 +0100
Subject: [PATCH] Removed sh This means that shebangs and executable flags will
 be respected

---
 src/12_generate_iso.sh                           | 2 +-
 src/Makefile                                     | 4 ++--
 src/build_minimal_linux_live.sh                  | 2 +-
 src/minimal_overlay/bundles/cf_cli/bundle.sh     | 4 ++--
 src/minimal_overlay/bundles/dropbear/bundle.sh   | 4 ++--
 src/minimal_overlay/bundles/felix/bundle.sh      | 4 ++--
 src/minimal_overlay/bundles/links/bundle.sh      | 4 ++--
 src/minimal_overlay/bundles/lua/bundle.sh        | 4 ++--
 src/minimal_overlay/bundles/mll_utils/bundle.sh  | 8 ++++----
 src/minimal_overlay/bundles/ncurses/01_get.sh    | 0
 src/minimal_overlay/bundles/ncurses/02_build.sh  | 0
 src/minimal_overlay/bundles/ncurses/bundle.sh    | 4 ++--
 src/minimal_overlay/bundles/openjdk/bundle.sh    | 4 ++--
 src/minimal_overlay/bundles/static_get/bundle.sh | 4 ++--
 src/minimal_overlay/bundles/util_linux/bundle.sh | 4 ++--
 src/minimal_overlay/bundles/zlib/bundle.sh       | 4 ++--
 src/minimal_overlay/overlay_build.sh             | 4 ++--
 17 files changed, 30 insertions(+), 30 deletions(-)
 mode change 100644 => 100755 src/minimal_overlay/bundles/ncurses/01_get.sh
 mode change 100644 => 100755 src/minimal_overlay/bundles/ncurses/02_build.sh
 mode change 100644 => 100755 src/minimal_overlay/bundles/ncurses/bundle.sh

diff --git a/src/12_generate_iso.sh b/src/12_generate_iso.sh
index 15ac5c888..0a3d815fe 100755
--- a/src/12_generate_iso.sh
+++ b/src/12_generate_iso.sh
@@ -54,7 +54,7 @@ OVERLAY_BUNDLES="$(grep -i ^OVERLAY_BUNDLES .config | cut -f2 -d'=')"
 if [ ! "$OVERLAY_BUNDLES" = "" ] ; then
   echo "Generating additional overlay bundles. This may take a while..."
   cd minimal_overlay
-  time sh overlay_build.sh
+  time ./overlay_build.sh
   cd $SRC_DIR
 else
   echo "Generation of additional overlay bundles has been skipped."
diff --git a/src/Makefile b/src/Makefile
index c7f9a24e1..c6c4fd79b 100644
--- a/src/Makefile
+++ b/src/Makefile
@@ -8,7 +8,7 @@
 
 all: clean
 	@echo "Launching the main build script..."
-	@time sh build_minimal_linux_live.sh 2>&1 | tee minimal_linux_live.log
+	@time ./build_minimal_linux_live.sh 2>&1 | tee minimal_linux_live.log
 
 clean:
 	@echo "Removing generated work artifacts..."
@@ -33,7 +33,7 @@ src:
 	@echo "Generating source archive..."
 	@rm -f minimal_linux_live_*_src.tar.xz
 	@mkdir -p work
-	@sh 08_prepare_src.sh 1>/dev/null
+	@./08_prepare_src.sh 1>/dev/null
 	@$(eval DATE_PARSED := $(shell LANG=en_US ; date +"%d-%b-%Y"))
 	@cd work/src && tar -cpf - `ls -A` | xz - > ../../minimal_linux_live_$(DATE_PARSED)_src.tar.xz && cd ../..
 	@echo "Source archive: minimal_linux_live_$(DATE_PARSED)_src.tar.xz"
diff --git a/src/build_minimal_linux_live.sh b/src/build_minimal_linux_live.sh
index 1d32a3c14..331fc3add 100755
--- a/src/build_minimal_linux_live.sh
+++ b/src/build_minimal_linux_live.sh
@@ -2,5 +2,5 @@
 
 for script in $(ls | grep '^[0-9]*_.*.sh'); do
   echo "$script"
-  time sh "$script"
+  time ./"$script"
 done
diff --git a/src/minimal_overlay/bundles/cf_cli/bundle.sh b/src/minimal_overlay/bundles/cf_cli/bundle.sh
index cf641b3e8..6fa4731b3 100755
--- a/src/minimal_overlay/bundles/cf_cli/bundle.sh
+++ b/src/minimal_overlay/bundles/cf_cli/bundle.sh
@@ -2,8 +2,8 @@
 
 SRC_DIR=$(pwd)
 
-time sh 01_get.sh
-time sh 02_install.sh
+time ./01_get.sh
+time ./02_install.sh
 
 cd $SRC_DIR
 
diff --git a/src/minimal_overlay/bundles/dropbear/bundle.sh b/src/minimal_overlay/bundles/dropbear/bundle.sh
index 6284178ab..fe94657d9 100755
--- a/src/minimal_overlay/bundles/dropbear/bundle.sh
+++ b/src/minimal_overlay/bundles/dropbear/bundle.sh
@@ -2,8 +2,8 @@
 
 SRC_DIR=$(pwd)
 
-time sh 01_get.sh
-time sh 02_build.sh
+time ./01_get.sh
+time ./02_build.sh
 
 cd $SRC_DIR
 
diff --git a/src/minimal_overlay/bundles/felix/bundle.sh b/src/minimal_overlay/bundles/felix/bundle.sh
index cf641b3e8..6fa4731b3 100755
--- a/src/minimal_overlay/bundles/felix/bundle.sh
+++ b/src/minimal_overlay/bundles/felix/bundle.sh
@@ -2,8 +2,8 @@
 
 SRC_DIR=$(pwd)
 
-time sh 01_get.sh
-time sh 02_install.sh
+time ./01_get.sh
+time ./02_install.sh
 
 cd $SRC_DIR
 
diff --git a/src/minimal_overlay/bundles/links/bundle.sh b/src/minimal_overlay/bundles/links/bundle.sh
index 6284178ab..fe94657d9 100755
--- a/src/minimal_overlay/bundles/links/bundle.sh
+++ b/src/minimal_overlay/bundles/links/bundle.sh
@@ -2,8 +2,8 @@
 
 SRC_DIR=$(pwd)
 
-time sh 01_get.sh
-time sh 02_build.sh
+time ./01_get.sh
+time ./02_build.sh
 
 cd $SRC_DIR
 
diff --git a/src/minimal_overlay/bundles/lua/bundle.sh b/src/minimal_overlay/bundles/lua/bundle.sh
index 143589c27..570c85e4c 100755
--- a/src/minimal_overlay/bundles/lua/bundle.sh
+++ b/src/minimal_overlay/bundles/lua/bundle.sh
@@ -2,7 +2,7 @@
 
 SRC_DIR=$(pwd)
 
-time sh 01_get.sh
-time sh 02_build.sh
+time ./01_get.sh
+time ./02_build.sh
 
 cd $SRC_DIR
diff --git a/src/minimal_overlay/bundles/mll_utils/bundle.sh b/src/minimal_overlay/bundles/mll_utils/bundle.sh
index 3653a88fa..07c425034 100755
--- a/src/minimal_overlay/bundles/mll_utils/bundle.sh
+++ b/src/minimal_overlay/bundles/mll_utils/bundle.sh
@@ -2,10 +2,10 @@
 
 SRC_DIR=$(pwd)
 
-time sh 01_prepare.sh
-time sh 02_disk_erase.sh
-time sh 03_installer.sh
-time sh 04_install.sh
+time ./01_prepare.sh
+time ./02_disk_erase.sh
+time ./03_installer.sh
+time ./04_install.sh
 
 cd $SRC_DIR
 
diff --git a/src/minimal_overlay/bundles/ncurses/01_get.sh b/src/minimal_overlay/bundles/ncurses/01_get.sh
old mode 100644
new mode 100755
diff --git a/src/minimal_overlay/bundles/ncurses/02_build.sh b/src/minimal_overlay/bundles/ncurses/02_build.sh
old mode 100644
new mode 100755
diff --git a/src/minimal_overlay/bundles/ncurses/bundle.sh b/src/minimal_overlay/bundles/ncurses/bundle.sh
old mode 100644
new mode 100755
index 6284178ab..fe94657d9
--- a/src/minimal_overlay/bundles/ncurses/bundle.sh
+++ b/src/minimal_overlay/bundles/ncurses/bundle.sh
@@ -2,8 +2,8 @@
 
 SRC_DIR=$(pwd)
 
-time sh 01_get.sh
-time sh 02_build.sh
+time ./01_get.sh
+time ./02_build.sh
 
 cd $SRC_DIR
 
diff --git a/src/minimal_overlay/bundles/openjdk/bundle.sh b/src/minimal_overlay/bundles/openjdk/bundle.sh
index cf641b3e8..6fa4731b3 100755
--- a/src/minimal_overlay/bundles/openjdk/bundle.sh
+++ b/src/minimal_overlay/bundles/openjdk/bundle.sh
@@ -2,8 +2,8 @@
 
 SRC_DIR=$(pwd)
 
-time sh 01_get.sh
-time sh 02_install.sh
+time ./01_get.sh
+time ./02_install.sh
 
 cd $SRC_DIR
 
diff --git a/src/minimal_overlay/bundles/static_get/bundle.sh b/src/minimal_overlay/bundles/static_get/bundle.sh
index cf641b3e8..6fa4731b3 100755
--- a/src/minimal_overlay/bundles/static_get/bundle.sh
+++ b/src/minimal_overlay/bundles/static_get/bundle.sh
@@ -2,8 +2,8 @@
 
 SRC_DIR=$(pwd)
 
-time sh 01_get.sh
-time sh 02_install.sh
+time ./01_get.sh
+time ./02_install.sh
 
 cd $SRC_DIR
 
diff --git a/src/minimal_overlay/bundles/util_linux/bundle.sh b/src/minimal_overlay/bundles/util_linux/bundle.sh
index 6284178ab..fe94657d9 100755
--- a/src/minimal_overlay/bundles/util_linux/bundle.sh
+++ b/src/minimal_overlay/bundles/util_linux/bundle.sh
@@ -2,8 +2,8 @@
 
 SRC_DIR=$(pwd)
 
-time sh 01_get.sh
-time sh 02_build.sh
+time ./01_get.sh
+time ./02_build.sh
 
 cd $SRC_DIR
 
diff --git a/src/minimal_overlay/bundles/zlib/bundle.sh b/src/minimal_overlay/bundles/zlib/bundle.sh
index 6284178ab..fe94657d9 100755
--- a/src/minimal_overlay/bundles/zlib/bundle.sh
+++ b/src/minimal_overlay/bundles/zlib/bundle.sh
@@ -2,8 +2,8 @@
 
 SRC_DIR=$(pwd)
 
-time sh 01_get.sh
-time sh 02_build.sh
+time ./01_get.sh
+time ./02_build.sh
 
 cd $SRC_DIR
 
diff --git a/src/minimal_overlay/overlay_build.sh b/src/minimal_overlay/overlay_build.sh
index 254fd6b84..750ea2a9c 100755
--- a/src/minimal_overlay/overlay_build.sh
+++ b/src/minimal_overlay/overlay_build.sh
@@ -19,7 +19,7 @@ if [ "$OVERLAY_BUNDLES" = "" ] ; then
   exit 1
 fi
 
-time sh overlay_clean.sh
+time ./overlay_clean.sh
 
 BUNDLES_LIST="$(echo $OVERLAY_BUNDLES | tr ',' ' ')"
 
@@ -42,7 +42,7 @@ do
   cd $BUNDLE_DIR
 
   echo "Building overlay bundle '$BUNDLE'..."
-  time sh $BUNDLE_SCRIPT
+  time $BUNDLE_SCRIPT
 
   cd $SRC_DIR
 done