diff options
| -rw-r--r-- | subr/pkg_configure_patch.subr | 4 | ||||
| -rw-r--r-- | subr/pkg_fetch_download.subr | 18 |
2 files changed, 11 insertions, 11 deletions
diff --git a/subr/pkg_configure_patch.subr b/subr/pkg_configure_patch.subr index b789a80e..7569c6ac 100644 --- a/subr/pkg_configure_patch.subr +++ b/subr/pkg_configure_patch.subr @@ -6,8 +6,8 @@ pkg_configure_patch() { local _patch_cwd="" _patch_dir="${MIDIPIX_BUILD_PWD}/patches" _patch_fname=""\ _patches_done="" _pkg_name_full="${PKG_NAME}${PKG_VERSION:+-${PKG_VERSION}}"; - if [ -n "${PKG_FNAME}" ]\ - && [ -n "${PKG_URLS_GIT}" ]; then + if [ -n "${PKG_FNAME:-}" ]\ + && [ -n "${PKG_URLS_GIT:-}" ]; then _patch_cwd="${PKG_BASE_DIR}"; else _patch_cwd="${PKG_BASE_DIR}/${PKG_SUBDIR}"; diff --git a/subr/pkg_fetch_download.subr b/subr/pkg_fetch_download.subr index 2b94d720..0affb358 100644 --- a/subr/pkg_fetch_download.subr +++ b/subr/pkg_fetch_download.subr @@ -10,14 +10,14 @@ pkg_fetch_download_clean_dlcache() { _pkg_urls_git_dname="${_pkg_urls_git%%=*}"; _pkg_urls_git_dname="${_pkg_urls_git_dname##*/}"; fi; - for _fname in $(cd "${_dlcachedir}/${_pkg_name}" && find \ - -mindepth 1 \ - -not -name "${_pkg_fname}" \ - -not -name "${_pkg_fname}.fetched" \ - ${_pkg_urls_git_dname:+ \ - -not -path "./${_pkg_urls_git_dname}" \ - -not -path "./${_pkg_urls_git_dname}/*" \ - -not -path "./${_pkg_urls_git_dname}.git" \ + for _fname in $(cd "${_dlcachedir}/${_pkg_name}" && find \ + -mindepth 1 \ + ${_pkg_fname:+-not -name "${_pkg_fname}"} \ + ${_pkg_fname:+-not -name "${_pkg_fname}.fetched"} \ + ${_pkg_urls_git_dname:+ \ + -not -path "./${_pkg_urls_git_dname}" \ + -not -path "./${_pkg_urls_git_dname}/*" \ + -not -path "./${_pkg_urls_git_dname}.git" \ -not -path "./${_pkg_urls_git_dname}.git/*"}); do _fname="${_dlcachedir}/${_pkg_name}/${_fname#./}" rtl_log_msg notice "Deleting redundant file \`%s' for package \`%s'." "${_fname}" "${_pkg_name}"; @@ -59,7 +59,7 @@ pkg_fetch_download() { return 1; fi; fi; - pkg_fetch_download_clean_dlcache "${BUILD_DLCACHEDIR}" "${PKG_NAME}" "${PKG_FNAME}" "${PKG_URLS_GIT}"; + pkg_fetch_download_clean_dlcache "${BUILD_DLCACHEDIR}" "${PKG_NAME}" "${PKG_FNAME:-}" "${PKG_URLS_GIT:-}"; fi; }; |