mk: include lib.sh earlier

this means we can now cd to wrkdir using findpath,
and it means the cd command can be wrapped in x_

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

1 files changed, 3 insertions, 6 deletions

diff --git a/mk b/mk
index d50a55c8..49750e3c 100755
--- a/mk
+++ b/mk
@@ -15,17 +15,14 @@ eval "`printf "LANG LANGUAGE LC_CTYPE LC_NUMERIC LC_TIME LC_COLLATE \
     awk '{ for (i=1; i<=NF; i++) $i = "export " $i "=C.UTF-8;"; print }'`"
 
 (
+. "include/lib.sh"
+
 xbarg0="$0"
 [ "${xbarg0##*/}" = "$xbarg0" ] && \
     xbarg0="`command -v "$xbarg0"`"
 
-commandv="`readlink -f "$xbarg0" 2>/dev/null`"
-[ -z "$commandv" ] && \
-    commandv="`realpath "$xbarg0" 2>/dev/null`"
+x_ cd "`findpath "$xbarg0"`"
 
-cd "${commandv%/*}" || exit 1
-
-. "include/lib.sh"
 . "include/env/init.sh"
 x_ xbmk_init "$@"