diff options
author | Renato Botelho <renato@netgate.com> | 2015-09-24 13:55:29 -0300 |
---|---|---|
committer | Renato Botelho <renato@netgate.com> | 2015-09-24 13:57:23 -0300 |
commit | 51fe2104bbaae7cb64bc598997d34a539fea7d17 (patch) | |
tree | 8de526eadb7082d5a3ba64dd222db221e8c80376 /tools | |
parent | eef931443d426e1a5a75352a75cd881d8223d979 (diff) | |
download | pfsense-51fe2104bbaae7cb64bc598997d34a539fea7d17.zip pfsense-51fe2104bbaae7cb64bc598997d34a539fea7d17.tar.gz |
If an error happened, just abort, there is no reason to ask user to press enter
Diffstat (limited to 'tools')
-rwxr-xr-x | tools/build_snapshots.sh | 5 | ||||
-rw-r--r-- | tools/builder_common.sh | 4 |
2 files changed, 0 insertions, 9 deletions
diff --git a/tools/build_snapshots.sh b/tools/build_snapshots.sh index c07dedc..9260fab 100755 --- a/tools/build_snapshots.sh +++ b/tools/build_snapshots.sh @@ -37,11 +37,6 @@ usage() { echo " -u: Do not upload snapshots" } -# 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 d8e96cf..caf4ae8 100644 --- a/tools/builder_common.sh +++ b/tools/builder_common.sh @@ -155,10 +155,6 @@ print_error_pfS() { echo "Log saved on ${LOGFILE}" && \ tail -n20 ${LOGFILE} >&2 echo - if [ -z "${NOT_INTERACTIVE}" ]; then - echo "Press enter to continue." - read ans - fi kill $$ exit 1 } |