From adbb2b576709b8fd15e59cfcebd672c27d50d01f Mon Sep 17 00:00:00 2001 From: Luke Shumaker Date: Mon, 27 May 2013 00:40:54 -0400 Subject: lib/common.sh: Adjust to work properly with `set -u`. --- lib/common.sh | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) (limited to 'lib/common.sh') diff --git a/lib/common.sh b/lib/common.sh index dbacebf..455eb03 100644 --- a/lib/common.sh +++ b/lib/common.sh @@ -1,10 +1,13 @@ +#!/hint/bash +# This may be included with or without `set -euE` + # Avoid any encoding problems export LANG=C shopt -s extglob # check if messages are to be printed using color -unset ALL_OFF BOLD BLUE GREEN RED YELLOW +declare ALL_OFF= BOLD= BLUE= GREEN= RED= YELLOW= if [[ -t 2 ]]; then # prefer terminal safe colored and bold text when tput is supported if tput setaf 0 &>/dev/null; then @@ -61,14 +64,14 @@ stat_done() { _setup_workdir=false setup_workdir() { - [[ -z $WORKDIR ]] && WORKDIR=$(mktemp -d --tmpdir "${0##*/}.XXXXXXXXXX") + [[ -z ${WORKDIR:-} ]] && WORKDIR=$(mktemp -d --tmpdir "${0##*/}.XXXXXXXXXX") _setup_workdir=true trap 'trap_abort' INT QUIT TERM HUP trap 'trap_exit' EXIT } cleanup() { - if [[ -n $WORKDIR ]] && $_setup_workdir; then + if [[ -n ${WORKDIR:-} ]] && $_setup_workdir; then rm -rf "$WORKDIR" fi exit ${1:-0} -- cgit v1.2.3-70-g09d2