diff options
| author | Leah Rowe <leah@libreboot.org> | 2025-05-10 18:23:57 +0100 |
|---|---|---|
| committer | Leah Rowe <leah@libreboot.org> | 2025-05-10 18:23:57 +0100 |
| commit | 466b156ecfd5d7dc3c72d49617a77c9a76b72b78 (patch) | |
| tree | 00dcc62bbd7324107cd202075622d867acdf9fca /include/init.sh | |
| parent | b0e5fa255ea53e0c82a5a6808821817773237c96 (diff) | |
| parent | 0aa99f4bf8b52ea6060f0cd72263b9d4b4e99699 (diff) | |
Merge branch 'master' into 25.06_branch
Diffstat (limited to 'include/init.sh')
| -rw-r--r-- | include/init.sh | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/include/init.sh b/include/init.sh index b9cb81b1..2dd9e88f 100644 --- a/include/init.sh +++ b/include/init.sh @@ -16,7 +16,7 @@ xbmkpath="$PATH" eval "`setvars "" _nogit board reinstall versiondate aur_notice configdir \ datadir version xbmkpwd relname xbmkpwd xbmktmp python pyver xbmklocal \ - xbmklock`" + xbmklock cvxbmk cvchk`" xbmk_init() { @@ -45,7 +45,7 @@ xbmkpkg() eval "`setcfg "config/dependencies/$2"`" chkvars pkg_add pkglist - $pkg_add $pkglist || err "Cannot install packages" + x_ $pkg_add $pkglist [ -n "$aur_notice" ] && \ printf "You need AUR packages: %s\n" "$aur_notice" 1>&2; : @@ -200,7 +200,7 @@ xbmk_create_pathdirs() ( # set up python v3.x in PATH, in case it's not set up correctly. # see code above that detected the correct python3 command. - cd "$XBMK_CACHE/xbmkpath" || err "can't cd $XBMK_CACHE/xbmkpath" + x_ cd "$XBMK_CACHE/xbmkpath" x_ ln -s "`pybin "$python"`" python ) || err "Can't set up python symlink in $XBMK_CACHE/xbmkpath"; : } |