From b2fcca8d3666a492026304ed460bfdcbb31cbf21 Mon Sep 17 00:00:00 2001 From: parazyd Date: Sat, 18 Mar 2017 21:33:18 +0100 Subject: [PATCH] fixups --- lib/libdevuansdk | 2 +- sdk | 9 ++++++--- 2 files changed, 7 insertions(+), 4 deletions(-) diff --git a/lib/libdevuansdk b/lib/libdevuansdk index 1aaa06c..32c3729 160000 --- a/lib/libdevuansdk +++ b/lib/libdevuansdk @@ -1 +1 @@ -Subproject commit 1aaa06c09f676f267f42a92e209d11166ecc78c6 +Subproject commit 32c372909ae7d85b04d14e0a3b35faa06108e2f8 diff --git a/sdk b/sdk index 2b472bd..e42f504 100755 --- a/sdk +++ b/sdk @@ -63,7 +63,7 @@ load() { ) blend_map=( - "heads" "https://git.devuan.org/heads/build-system/raw/master/heads.blend" + "heads" "$R/../heads.blend" ) oslib="${os_map[$os]}" @@ -82,7 +82,11 @@ load() { [[ -f $blendlib ]] || { warn "no valid blend specified" } source $oslib - [[ -f $blendlib ]] && source $blendlib && act "$os blend leaded" && export BLEND=1 + [[ -f $blendlib ]] && { + source $blendlib || zerr + act "$os blend leaded" + export BLEND=1 + } workdir="$R/tmp/${os}-${arch}-build" strapdir="$workdir/bootstrap" @@ -98,4 +102,3 @@ TRAPZERR() { zerr; return $? } notice "live-sdk loaded" export PROMPT="%F{yellow}%(?..%? )%{$reset_color%}livesdk@%{$fg[red]%}%m %{$reset_color%} %{$fg[blue]%}%#%{$fg_bold[blue]%}%{$reset_color%} " -