Fix some set -u failures

2 files changed, 9 insertions, 9 deletions

diff --git a/src/share/poudriere/common.sh b/src/share/poudriere/common.sh
index d39f4207..fb21cd83 100755
--- a/src/share/poudriere/common.sh
+++ b/src/share/poudriere/common.sh
@@ -150,7 +150,7 @@ _msg_n() {
 	fi
 	case "${COLOR_ARROW-}${1}" in
 	*$'\033'"["*)
-		printf "${COLOR_ARROW}${elapsed}${DRY_MODE-}${arrow:+${COLOR_ARROW}${arrow} }${COLOR_RESET}%s${COLOR_RESET}${NL}" "$*"
+		printf "${COLOR_ARROW-}${elapsed}${DRY_MODE-}${arrow:+${COLOR_ARROW-}${arrow} }${COLOR_RESET}%s${COLOR_RESET}${NL}" "$*"
 		;;
 	*)
 		printf "${elapsed}${DRY_MODE-}${arrow:+${arrow} }%s${NL}" "$*"
diff --git a/src/share/poudriere/include/pkg.sh b/src/share/poudriere/include/pkg.sh
index 995d89fc..f9beeea3 100644
--- a/src/share/poudriere/include/pkg.sh
+++ b/src/share/poudriere/include/pkg.sh
@@ -27,7 +27,7 @@ pkg_get_origin() {
 	[ $# -lt 2 ] && eargs pkg_get_origin var_return pkg [origin]
 	local var_return="$1"
 	local pkg="$2"
-	local _origin=$3
+	local _origin="${3-}"
 	local SHASH_VAR_PATH SHASH_VAR_PREFIX=
 
 	get_pkg_cache_dir SHASH_VAR_PATH "${pkg}"
@@ -150,15 +150,15 @@ pkg_get_dep_origin_pkgnames() {
 	while [ $# -ne 0 ]; do
 		origin="$1"
 		pkgname="$2"
-		compiled_dep_origins="${compiled_dep_origins}${compiled_dep_origins:+ }${origin}"
-		compiled_dep_pkgnames="${compiled_dep_pkgnames}${compiled_dep_pkgnames:+ }${pkgname}"
+		compiled_dep_origins="${compiled_dep_origins:+${compiled_dep_origins} }${origin}"
+		compiled_dep_pkgnames="${compiled_dep_pkgnames:+${compiled_dep_pkgnames} }${pkgname}"
 		shift 2
 	done
 	if [ -n "${var_return_origins}" ]; then
-		setvar "${var_return_origins}" "${compiled_dep_origins}"
+		setvar "${var_return_origins}" "${compiled_dep_origins-}"
 	fi
 	if [ -n "${var_return_pkgnames}" ]; then
-		setvar "${var_return_pkgnames}" "${compiled_dep_pkgnames}"
+		setvar "${var_return_pkgnames}" "${compiled_dep_pkgnames-}"
 	fi
 }
 
@@ -177,14 +177,14 @@ pkg_get_options() {
 				off|false) key="-${key}" ;;
 				on|true) key="+${key}" ;;
 			esac
-			_compiled_options="${_compiled_options}${_compiled_options:+ }${key}"
+			_compiled_options="${_compiled_options:+${_compiled_options} }${key}"
 		done <<-EOF
 		$(injail ${PKG_BIN} query -F "/packages/All/${pkg##*/}" '%Ok %Ov' | sort)
 		EOF
-		shash_set 'pkg' 'options2' "${_compiled_options}"
+		shash_set 'pkg' 'options2' "${_compiled_options-}"
 	fi
 	if [ -n "${var_return}" ]; then
-		setvar "${var_return}" "${_compiled_options}"
+		setvar "${var_return}" "${_compiled_options-}"
 	fi
 }