diff options
| author | Lucía Andrea Illanes Albornoz <lucia@luciaillanes.de> | 2023-02-18 09:34:54 +0100 |
|---|---|---|
| committer | Lucía Andrea Illanes Albornoz <lucia@luciaillanes.de> | 2023-02-18 09:34:54 +0100 |
| commit | aec528544e1ab1e9499d850458eae9a0d0e1246e (patch) | |
| tree | 63a3e17a1647bad7f83d982ddf04cb0963aaee17 | |
| parent | 7869daa4d16b119cfd41eb4a48c00a08e63418d4 (diff) | |
| download | midipix_build-aec528544e1ab1e9499d850458eae9a0d0e1246e.tar.bz2 midipix_build-aec528544e1ab1e9499d850458eae9a0d0e1246e.tar.xz | |
pkgtool.sh: correctly set ${PKG_FNAME} if empty.
| -rwxr-xr-x | pkgtool.sh | 18 |
1 files changed, 15 insertions, 3 deletions
@@ -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; |