saad/minimal
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Removed sh

Browse Source 
This means that shebangs and executable flags will be respected
This commit is contained in:
bauen1 2017-11-13 21:29:00 +01:00
parent dd4ef8e4c9
commit 7a76cdc71f
No known key found for this signature in database
GPG Key ID: FF0AAF5E0812BA9C
17 changed files with 30 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/12_generate_iso.sh
View File

@ -54,7 +54,7 @@ OVERLAY_BUNDLES="$(grep -i ^OVERLAY_BUNDLES .config | cut -f2 -d'=')"
if [ ! "$OVERLAY_BUNDLES" = "" ] ; then if [ ! "$OVERLAY_BUNDLES" = "" ] ; then
echo "Generating additional overlay bundles. This may take a while..." echo "Generating additional overlay bundles. This may take a while..."
cd minimal_overlay cd minimal_overlay
time sh overlay_build.sh time ./overlay_build.sh
cd $SRC_DIR cd $SRC_DIR
else else
echo "Generation of additional overlay bundles has been skipped." echo "Generation of additional overlay bundles has been skipped."

4
src/Makefile
View File

@ -8,7 +8,7 @@
all: clean all: clean
@echo "Launching the main build script..." @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: clean:
@echo "Removing generated work artifacts..." @echo "Removing generated work artifacts..."
@ -33,7 +33,7 @@ src:
@echo "Generating source archive..." @echo "Generating source archive..."
@rm -f minimal_linux_live_*_src.tar.xz @rm -f minimal_linux_live_*_src.tar.xz
@mkdir -p work @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")) @$(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 ../.. @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" @echo "Source archive: minimal_linux_live_$(DATE_PARSED)_src.tar.xz"

2
src/build_minimal_linux_live.sh
View File

@ -2,5 +2,5 @@
for script in $(ls | grep '^[0-9]*_.*.sh'); do for script in $(ls | grep '^[0-9]*_.*.sh'); do
echo "$script" echo "$script"
time sh "$script" time ./"$script"
done done

4
src/minimal_overlay/bundles/cf_cli/bundle.sh
View File

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

4
src/minimal_overlay/bundles/dropbear/bundle.sh
View File

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

4
src/minimal_overlay/bundles/felix/bundle.sh
View File

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

4
src/minimal_overlay/bundles/links/bundle.sh
View File

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

4
src/minimal_overlay/bundles/lua/bundle.sh
View File

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

8
src/minimal_overlay/bundles/mll_utils/bundle.sh
View File

@ -2,10 +2,10 @@
SRC_DIR=$(pwd) SRC_DIR=$(pwd)
time sh 01_prepare.sh time ./01_prepare.sh
time sh 02_disk_erase.sh time ./02_disk_erase.sh
time sh 03_installer.sh time ./03_installer.sh
time sh 04_install.sh time ./04_install.sh
cd $SRC_DIR cd $SRC_DIR

0
src/minimal_overlay/bundles/ncurses/01_get.sh Normal file → Executable file
View File

0
src/minimal_overlay/bundles/ncurses/02_build.sh Normal file → Executable file
View File

4
src/minimal_overlay/bundles/ncurses/bundle.sh Normal file → Executable file
View File

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

4
src/minimal_overlay/bundles/openjdk/bundle.sh
View File

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

4
src/minimal_overlay/bundles/static_get/bundle.sh
View File

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

4
src/minimal_overlay/bundles/util_linux/bundle.sh
View File

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

4
src/minimal_overlay/bundles/zlib/bundle.sh
View File

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

4
src/minimal_overlay/overlay_build.sh
View File

@ -19,7 +19,7 @@ if [ "$OVERLAY_BUNDLES" = "" ] ; then
exit 1 exit 1
fi fi
time sh overlay_clean.sh time ./overlay_clean.sh
BUNDLES_LIST="$(echo $OVERLAY_BUNDLES | tr ',' ' ')" BUNDLES_LIST="$(echo $OVERLAY_BUNDLES | tr ',' ' ')"
@ -42,7 +42,7 @@ do
cd $BUNDLE_DIR cd $BUNDLE_DIR
echo "Building overlay bundle '$BUNDLE'..." echo "Building overlay bundle '$BUNDLE'..."
time sh $BUNDLE_SCRIPT time $BUNDLE_SCRIPT
cd $SRC_DIR cd $SRC_DIR
done done