From aec528544e1ab1e9499d850458eae9a0d0e1246e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Luc=C3=ADa=20Andrea=20Illanes=20Albornoz?=
 <lucia@luciaillanes.de>
Date: Sat, 18 Feb 2023 09:34:54 +0100
Subject: pkgtool.sh: correctly set ${PKG_FNAME} if empty.

---
 pkgtool.sh | 18 +++++++++++++++---
 1 file changed, 15 insertions(+), 3 deletions(-)

(limited to 'pkgtool.sh')

diff --git a/pkgtool.sh b/pkgtool.sh
index 04a53eb9..f97b2fc4 100755
--- a/pkgtool.sh
+++ b/pkgtool.sh
@@ -301,15 +301,27 @@ pkgtoolp_mirror_fetch() {
 				fi;
 
 			else
-				if ! rtl_get_var_unsafe \$_ppmf_pkg_fname -u "PKG_${_ppmf_pkg_name_real}_FNAME"; then
+				if rtl_get_var_unsafe \$_ppmf_pkg_fname -u "PKG_${_ppmf_pkg_name_real}_FNAME"\
+				&& [ "${_ppmf_pkg_fname:+1}" != 1 ]; then
 					_ppmf_pkg_fname="${_ppmf_pkg_url##*/}";
 				fi;
 				rtl_log_msg "info" "${MSG_pkgtool_pkg_archive_mirroring}" "${_ppmf_pkg_name}" "${_ppmf_pkg_url}";
+
 				if ! rtl_fileop mkdir "${_ppmf_mirror_dname}/${_ppmf_pkg_name}"\
-				|| ! rtl_fetch_url_wget "${_ppmf_pkg_url}" "${_ppmf_pkg_sha256sum}" "${_ppmf_mirror_dname}/${_ppmf_pkg_name}" "${_ppmf_pkg_fname}" "${_ppmf_pkg_name_real}" ""; then
+				|| ! rtl_fetch_url_wget						\
+						"${_ppmf_pkg_url}"				\
+						"${_ppmf_pkg_sha256sum}"			\
+						"${_ppmf_mirror_dname}/${_ppmf_pkg_name}"	\
+						"${_ppmf_pkg_fname}" "${_ppmf_pkg_name_real}"	\
+						"";
+				then
 					_ppmf_rc=1; rtl_log_msg "warning" "${MSG_pkgtool_pkg_mirror_fail}" "${_ppmf_pkg_name}";
 				else
-					rtl_fetch_clean_dlcache "${_ppmf_mirror_dname}" "${_ppmf_pkg_name}" "${_ppmf_pkg_fname}" "${_ppmf_pkg_urls_git}";
+					rtl_fetch_clean_dlcache		\
+					       "${_ppmf_mirror_dname}"	\
+					       "${_ppmf_pkg_name}"	\
+					       "${_ppmf_pkg_fname}"	\
+					       "${_ppmf_pkg_urls_git}";
 				fi;
 			fi;
 
-- 
cgit v1.2.3