From 3c57f8e0ab832a65fb243c3ac85f8f58bba1a88c Mon Sep 17 00:00:00 2001 From: Austin English Date: Sat, 9 May 2020 04:00:02 -0500 Subject: [PATCH] scripts: move sets out of shebang The makefile calls the scripts with `bash -x ...`, which overrides the shebang, so the -e is dropped. --- scripts/buildFilesystem.sh | 5 ++++- scripts/buildInitramFs.sh | 5 ++++- scripts/buildKernel.sh | 5 ++++- scripts/crossmenuconfig.sh | 5 ++++- scripts/injectKernelIntoFS.sh | 5 ++++- scripts/patchKernel.sh | 5 ++++- 6 files changed, 24 insertions(+), 6 deletions(-) diff --git a/scripts/buildFilesystem.sh b/scripts/buildFilesystem.sh index b81605f..2e4c2ae 100755 --- a/scripts/buildFilesystem.sh +++ b/scripts/buildFilesystem.sh @@ -1,4 +1,7 @@ -#!/bin/bash -xe +#!/bin/bash + +set -x +set -e # Build fs, image diff --git a/scripts/buildInitramFs.sh b/scripts/buildInitramFs.sh index 5bd2dc6..75a80d1 100755 --- a/scripts/buildInitramFs.sh +++ b/scripts/buildInitramFs.sh @@ -1,4 +1,7 @@ -#!/bin/sh -xe +#!/bin/bash + +set -x +set -e #Build initramfs image diff --git a/scripts/buildKernel.sh b/scripts/buildKernel.sh index 150f06f..281ddd0 100755 --- a/scripts/buildKernel.sh +++ b/scripts/buildKernel.sh @@ -1,4 +1,7 @@ -#!/bin/sh -xe +#!/bin/bash + +set -x +set -e #Build kenerl, wifi firmware diff --git a/scripts/crossmenuconfig.sh b/scripts/crossmenuconfig.sh index efc9eed..c6c6deb 100755 --- a/scripts/crossmenuconfig.sh +++ b/scripts/crossmenuconfig.sh @@ -1,4 +1,7 @@ -#!/bin/sh -xe +#!/bin/bash + +set -x +set -e #Runs Make menuconfig with the proper enviroment vars for cross compiling arm #Grabs the file named config in resources/BuildResources directory, and updates it diff --git a/scripts/injectKernelIntoFS.sh b/scripts/injectKernelIntoFS.sh index fa19720..2491464 100755 --- a/scripts/injectKernelIntoFS.sh +++ b/scripts/injectKernelIntoFS.sh @@ -1,4 +1,7 @@ -#!/bin/sh -xe +#!/bin/bash + +set -x +set -e # This file is part of PrawnOS (http://www.prawnos.com) # Copyright (c) 2018 Hal Emmerich diff --git a/scripts/patchKernel.sh b/scripts/patchKernel.sh index 6a435b6..8850daa 100755 --- a/scripts/patchKernel.sh +++ b/scripts/patchKernel.sh @@ -1,4 +1,7 @@ -#!/bin/sh -xe +#!/bin/bash + +set -x +set -e if [ -z "$1" ] then