From d6fefabad739eded31cf6a92bc95803bb829a5fe Mon Sep 17 00:00:00 2001 From: Patrick Spek Date: Sun, 8 May 2022 13:45:38 +0200 Subject: Small updates to pkgsrc --- .local/bin/pkgsrc | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) (limited to '.local') diff --git a/.local/bin/pkgsrc b/.local/bin/pkgsrc index 5f09a2d..e6b1a7e 100755 --- a/.local/bin/pkgsrc +++ b/.local/bin/pkgsrc @@ -10,7 +10,7 @@ # FOR A PARTICULAR PURPOSE. See the GNU Affero General Public License for more # details. -readonly PKGSRC_ROOT="$HOME/.local/src/pkgsrc" +readonly PKGSRC_ROOT="$HOME/.local/src/pkgsrc" # TODO: Make configurable readonly PKGSRC_DURATIONS="$XDG_DATA_HOME/pkgsrc/durations" main() @@ -55,6 +55,7 @@ action_add() do cd -- "$PKGSRC_ROOT" + # cd wont fail here if pkg_resolve had no output if ! cd -- "$(pkg_resolve "$package")" then printf "No package found for %s\n" "$package" @@ -106,7 +107,7 @@ action_init() then mkdir -p -- "${PKGSRC_ROOT%/*}" cd -- "${PKGSRC_ROOT%/*}" - cvs -d anoncvs@anoncvs.NetBSD.org:/cvsroot checkout -P pkgsrc + cvs -d anoncvs@anoncvs.NetBSD.org:/cvsroot checkout -P pkgsrc || die 1 fi if [ -d "$HOME/.pkgsrc" ] @@ -117,7 +118,7 @@ action_init() cd -- "$PKGSRC_ROOT/bootstrap" rm -fr -- work - ./bootstrap --unprivileged --prefix="$HOME/.pkgsrc" + ./bootstrap --unprivileged --prefix="$HOME/.pkgsrc" # TODO: Make configurable printf "Bootstrapped in %s\n" "$(time_duration "$PKGSRC_INIT" "$(time_unix)")" } @@ -194,7 +195,7 @@ die() pkg_resolve() { - readlink -f "$PKGSRC_ROOT"/*/"$1" || readlink -f "$PKGSRC_ROOT/$1" + readlink -f "$PKGSRC_ROOT"/*/"$1" || readlink -f "$PKGSRC_ROOT/$1" # What if both fail? } time_unix() -- cgit v1.1