Merge pull request #91 from bauen1/remove-sh

Changed scripts to use bash or removed time usage

src/12_generate_iso.sh

@@ -1,4 +1,4 @@
-#!/bin/sh
+#!/bin/bash
 
 # TODO - this shell script file needs serios refactoring since right now it does
 # too many things:
@@ -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."

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"

src/build_minimal_linux_live.sh

@@ -1,6 +1,6 @@
-#!/bin/sh
+#!/bin/bash
 
 for script in $(ls | grep '^[0-9]*_.*.sh'); do
   echo "$script"
-  time sh "$script"
+  time ./"$script"
 done

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
+./01_get.sh
+./02_install.sh
 
 cd $SRC_DIR
 

src/minimal_overlay/bundles/dropbear/bundle.sh

@@ -2,8 +2,8 @@
 
 SRC_DIR=$(pwd)
 
-time sh 01_get.sh
-time sh 02_build.sh
+./01_get.sh
+./02_build.sh
 
 cd $SRC_DIR
 

src/minimal_overlay/bundles/felix/bundle.sh

@@ -2,8 +2,8 @@
 
 SRC_DIR=$(pwd)
 
-time sh 01_get.sh
-time sh 02_install.sh
+./01_get.sh
+./02_install.sh
 
 cd $SRC_DIR
 

src/minimal_overlay/bundles/links/bundle.sh

@@ -2,8 +2,8 @@
 
 SRC_DIR=$(pwd)
 
-time sh 01_get.sh
-time sh 02_build.sh
+./01_get.sh
+./02_build.sh
 
 cd $SRC_DIR
 

src/minimal_overlay/bundles/lua/bundle.sh

@@ -2,7 +2,7 @@
 
 SRC_DIR=$(pwd)
 
-time sh 01_get.sh
-time sh 02_build.sh
+./01_get.sh
+./02_build.sh
 
 cd $SRC_DIR

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
+./01_prepare.sh
+./02_disk_erase.sh
+./03_installer.sh
+./04_install.sh
 
 cd $SRC_DIR
 

src/minimal_overlay/bundles/ncurses/bundle.sh

@@ -2,8 +2,8 @@
 
 SRC_DIR=$(pwd)
 
-time sh 01_get.sh
-time sh 02_build.sh
+./01_get.sh
+./02_build.sh
 
 cd $SRC_DIR
 

src/minimal_overlay/bundles/openjdk/bundle.sh

@@ -2,8 +2,8 @@
 
 SRC_DIR=$(pwd)
 
-time sh 01_get.sh
-time sh 02_install.sh
+./01_get.sh
+./02_install.sh
 
 cd $SRC_DIR
 

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
+./01_get.sh
+./02_install.sh
 
 cd $SRC_DIR
 

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
+./01_get.sh
+./02_build.sh
 
 cd $SRC_DIR
 

src/minimal_overlay/bundles/zlib/bundle.sh

@@ -2,8 +2,8 @@
 
 SRC_DIR=$(pwd)
 
-time sh 01_get.sh
-time sh 02_build.sh
+./01_get.sh
+./02_build.sh
 
 cd $SRC_DIR
 

src/minimal_overlay/overlay_build.sh

@@ -1,4 +1,4 @@
-#!/bin/sh
+#!/bin/bash
 
 SRC_DIR=$(pwd)
 
@@ -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