diff --git a/install.zsh b/install.zsh index e763f55..380f5b7 100755 --- a/install.zsh +++ b/install.zsh @@ -33,6 +33,8 @@ zparseopts -D -E p:=install_path -path:=install_path f=force -force=force if [[ ! $install_path ]]; then install_path=$HOME/.local/bin +else + install_path=${install_path[2]} fi for prog in $@; do @@ -44,6 +46,8 @@ for prog in $@; do if [[ -e $install_path/${prog:t} && ! $force ]]; then warning "$prog already exists at $install_path. Skipping." else - ln -fsr $prog $install_path + check "Installing $prog… " + ln -fsr $prog $install_path || fail + succeed fi done diff --git a/void/xbps-worldfile b/void/xbps-worldfile index ce0f319..5d87efb 100755 --- a/void/xbps-worldfile +++ b/void/xbps-worldfile @@ -37,7 +37,7 @@ fi EDITFILE=$(mktemp -p ${TMPDIR:-/tmp} xbps-worldfile.edit.XXXXXXXXXX) cp $TMPFILE $EDITFILE -$EDITOR $EDITFILE +${EDITOR:-/usr/bin/vim} $EDITFILE autopkgs=$(not-in-left $EDITFILE $TMPFILE | first-col) manualpkgs=$(not-in-left $TMPFILE $EDITFILE | first-col)