pmodules/Pmodules
1
0
Fork 0
mirror of https://github.com/Pmodules/Pmodules.git synced 2026-06-26 09:33:08 +02:00
Code Issues Packages Projects Releases Wiki Activity

modbuild: bugfixes in get_overlay_name_and_dir()

Browse Source
This commit is contained in:
gsell
2021-12-07 17:38:20 +01:00
parent de118b20f4
commit 7acd70d2df
1 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Pmodules/modbuild.in
+4 -4
View File
@@ -423,21 +423,21 @@ get_overlay_name_and_dir() {
if [[ -v PMODULES_OVERLAY_CONF ]]; then
config_files+=("${PMODULES_OVERLAY_CONF}")
fi
config_files+=("${HOME}/.Pmodules/overlay.conf")
config_files+=("${HOME}/.Pmodules/overlays.conf")
config_files+=("${OVERLAY_CONF}")
for config_file in "${config_files[@]}"; do
[[ -r "${OVERLAY_CONF}" ]] || continue
[[ -r "${config_file}" ]] || continue
local toks=()
while read -a toks; do
[[ -n "${toks[0]}" ]] || continue
[[ ! "${toks[0]}" =~ \#* ]] || continue
[[ ${toks[0]} == \#* ]] && continue
if [[ ${toks[0]} == $3 ]] || [[ ${toks[1]} == $3 ]]; then
std::upvar $1 "${toks[0]}"
std::upvar $2 "${toks[1]}"
return 0
fi
done < "${config_file}"
fi
done
return 1
}