diff options
| author | Renato Botelho <renato@netgate.com> | 2015-09-07 17:13:50 -0300 |
|---|---|---|
| committer | Renato Botelho <renato@netgate.com> | 2015-09-07 17:13:50 -0300 |
| commit | 6007bbbb188f8d81a541ef8178ef3d71a28bd6ec (patch) | |
| tree | 11b23ebf11cb35aacc10593de907af82d98d26e0 /tools | |
| parent | 4010811baabe3d402c6e1db95b975c04409b54c8 (diff) | |
| download | pfsense-6007bbbb188f8d81a541ef8178ef3d71a28bd6ec.zip pfsense-6007bbbb188f8d81a541ef8178ef3d71a28bd6ec.tar.gz | |
Do not wait a key to be pressed when build.sh is called by build_snapshots.sh
Diffstat (limited to 'tools')
| -rwxr-xr-x | tools/build_snapshots.sh | 5 | ||||
| -rw-r--r-- | tools/builder_common.sh | 6 |
2 files changed, 9 insertions, 2 deletions
diff --git a/tools/build_snapshots.sh b/tools/build_snapshots.sh index ffb2b09..84a1f32 100755 --- a/tools/build_snapshots.sh +++ b/tools/build_snapshots.sh @@ -30,6 +30,11 @@ # OF THE POSSIBILITY OF SUCH DAMAGE. # +# Use an env var to let build.sh know we are running build_snapshots.sh +# This will avoid build.sh to run in interactive mode and wait a key +# to be pressed when something goes wrong +export NOT_INTERACTIVE=1 + export BUILDER_TOOLS=$(realpath $(dirname ${0})) export BUILDER_ROOT=$(realpath "${BUILDER_TOOLS}/..") diff --git a/tools/builder_common.sh b/tools/builder_common.sh index 1125850..98c3669 100644 --- a/tools/builder_common.sh +++ b/tools/builder_common.sh @@ -155,8 +155,10 @@ print_error_pfS() { echo "Log saved on ${LOGFILE}" && \ tail -n20 ${LOGFILE} >&2 echo - echo "Press enter to continue." - read ans + if [ -z "${NOT_INTERACTIVE}" ]; then + echo "Press enter to continue." + read ans + fi kill $$ exit 1 } |
