diff options
Diffstat (limited to 'include/lib.sh')
| -rwxr-xr-x | include/lib.sh | 34 |
1 files changed, 12 insertions, 22 deletions
diff --git a/include/lib.sh b/include/lib.sh index 2fc17cfe..3e137d63 100755 --- a/include/lib.sh +++ b/include/lib.sh @@ -60,9 +60,7 @@ read -r projectsite < projectsite || : install_packages() { [ $# -lt 2 ] && badcmd "fewer than two arguments" - [ -f "config/dependencies/$2" ] || badcmd "unsupported target" - - . "config/dependencies/$2" || $err "! . config/dependencies/$2" + eval `setcfg "config/dependencies/$2"` $pkg_add $pkglist || $err "Cannot install packages" @@ -127,25 +125,6 @@ done relname="$projectname-$version" export LOCALVERSION="-$projectname-${version%%-*}" -scan_config() -{ - awkstr=" /\{.*$1.*}{/ {flag=1;next} /\}/{flag=0} flag { print }" - confdir="$2" - revfile="$(mktemp -t sources.XXXXXXXXXX)" - cat "$confdir/"* > "$revfile" || $err "$confdir: can't cat files" - while read -r line ; do - set $line 1>/dev/null 2>/dev/null || : - if [ "${1%:}" = "depend" ]; then - depend="$depend $2" - else - eval "${1%:}=\"$2\"" - fi - done << EOF - $(eval "awk '$awkstr' \"$revfile\"") -EOF - rm -f "$revfile" || $err "scan_config: Cannot remove tmpfile" -} - check_defconfig() { [ -d "$1" ] || $err "Target '$1' not defined." @@ -253,3 +232,14 @@ cbfs() lzma="-c lzma" && [ $# -gt 3 ] && lzma="-t raw" x_ "$cbfstool" "$1" $ccmd -f "$2" -n "$3" $lzma } + +setcfg() +{ + if [ $# -gt 1 ]; then + printf "e \"%s\" f missing && return %s;\n" "$1" "$2" + else + printf "e \"%s\" f missing && %s \"Missing config\";\n" "$1" \ + "$err" + fi + printf ". \"%s\" || %s \"Could not read config\";\n" "$1" "$err" +} |