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

Signed-off-by: Leah Rowe <leah@libreboot.org>

1 files changed, 11 insertions, 10 deletions

diff --git a/include/lib.sh b/include/lib.sh
index 1fea3640..7f8adcc6 100644
--- a/include/lib.sh
+++ b/include/lib.sh
@@ -30,9 +30,6 @@ x_() {
 	[ $# -lt 1 ] || "$@" || $err "Unhandled error for: $(echo "$@")"; :
 }
 
-xbmkpwd="`pwd`" || $err "Cannot generate PWD"
-export PWD="$xbmkpwd"
-
 setvars()
 {
 	_setvars="" && [ $# -lt 2 ] && $err "setvars: too few arguments"
@@ -49,13 +46,6 @@ chkvars()
 	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()
 {
 	[ $# -gt 1 ] && printf "e \"%s\" f missing && return %s;\n" "$1" "$2"
@@ -88,6 +78,17 @@ install_packages()
 	[ -n "$aur_notice" ] && \
 	    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
 	install_packages "$@" || exit 1
 	exit 0