From f6f7f2f65712e6fa114f5751a72ad26cd893e92f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Luc=C3=ADa=20Andrea=20Illanes=20Albornoz?=
 <lucia@luciaillanes.de>
Date: Sun, 19 Feb 2023 07:19:26 +0100
Subject: Reject empty variables from the command line.

---
 pkgtool.sh | 13 ++++++++++---
 1 file changed, 10 insertions(+), 3 deletions(-)

(limited to 'pkgtool.sh')

diff --git a/pkgtool.sh b/pkgtool.sh
index 6b0ad0f3..65a4a84a 100755
--- a/pkgtool.sh
+++ b/pkgtool.sh
@@ -29,7 +29,8 @@ pkgtoolp_init() {
 	  		"${_pi_rstatus}" "pkgtoolp_init_getopts_fn"	\
 			"${_pi_optstring}" "${@}"			\
 	  || ! ex_init_prereqs "${_pi_rstatus}" "${_pi_prereqs}"	\
-	  || ! ex_pkg_load_vars "${_pi_rstatus}"			\
+	  || ! ex_pkg_load_vars						\
+	  		"${_pi_rstatus}" \$ARCH \$BUILD_KIND \$PREFIX	\
 	  || ! pkgtoolp_init_args "${_pi_rstatus}";
 	then
 		_pi_rc=1;
@@ -112,10 +113,16 @@ pkgtoolp_init_getopts_fn() {
 		shift 2;
 
 		case "${1}" in
-		*=*)	rtl_set_var_unsafe "${1%%=*}" "${1#*=}"; ;;
+		*=*)	rtl_set_var_from_cmdline "${_ppigf_rstatus}" "${1}";
+			_ppigf_rc="${?}"; ;;
 		*)	PKGTOOL_PKG_NAME="${1}"; ;;
 		esac;
-		_ppigf_shiftfl=1;
+
+		if [ "${_ppigf_rc}" -ne 0 ]; then
+			return "${_ppigf_rc}";
+		else
+			_ppigf_shiftfl=1;
+		fi;
 		;;
 
 	done)
-- 
cgit v1.2.3