canoeboot
/
cbmk
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

lib.sh: tidy up opening logic (put it together) 

Signed-off-by: Leah Rowe <leah@libreboot.org>
25.04_branch
Leah Rowe 2025-04-18 02:09:47 +01:00
parent 46fb5786e0
commit dbf40653b2
1 changed files with 11 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
include/lib.sh
View File

@ -30,9 +30,6 @@ x_() {
[ $# -lt 1 ] || "$@" || $err "Unhandled error for: $(echo "$@")"; : [ $# -lt 1 ] || "$@" || $err "Unhandled error for: $(echo "$@")"; :
} }
xbmkpwd="`pwd`" || $err "Cannot generate PWD"
export PWD="$xbmkpwd"
setvars() setvars()
{ {
_setvars="" && [ $# -lt 2 ] && $err "setvars: too few arguments" _setvars="" && [ $# -lt 2 ] && $err "setvars: too few arguments"
@ -49,13 +46,6 @@ chkvars()
done; : done; :
} }
eval "`setvars "" _nogit board reinstall versiondate aur_notice configdir \
datadir version relname xbmktmp`"
for fv in version versiondate; do
eval "[ ! -f \".$fv\" ] || read -r $fv < \".$fv\" || :"
done
setcfg() setcfg()
{ {
[ $# -gt 1 ] && printf "e \"%s\" f missing && return %s;\n" "$1" "$2" [ $# -gt 1 ] && printf "e \"%s\" f missing && return %s;\n" "$1" "$2"
@ -88,6 +78,17 @@ install_packages()
[ -n "$aur_notice" ] && \ [ -n "$aur_notice" ] && \
printf "You need AUR packages: %s\n" "$aur_notice" 1>&2; : printf "You need AUR packages: %s\n" "$aur_notice" 1>&2; :
} }
xbmkpwd="`pwd`" || $err "Cannot generate PWD"
export PWD="$xbmkpwd"
eval "`setvars "" _nogit board reinstall versiondate aur_notice configdir \
datadir version relname xbmktmp`"
for fv in version versiondate; do
eval "[ ! -f \".$fv\" ] || read -r $fv < \".$fv\" || :"
done
if [ $# -gt 0 ] && [ "$1" = "dependencies" ]; then if [ $# -gt 0 ] && [ "$1" = "dependencies" ]; then
install_packages "$@" || exit 1 install_packages "$@" || exit 1
exit 0 exit 0