aboutsummaryrefslogtreecommitdiff
path: root/.local/bin/pkgsrc
diff options
context:
space:
mode:
authorPatrick Spek <p.spek@tyil.nl>2022-05-08 13:45:38 +0200
committerPatrick Spek <p.spek@tyil.nl>2022-05-08 13:47:09 +0200
commitd6fefabad739eded31cf6a92bc95803bb829a5fe (patch)
tree710186b6e109c84723bbfe1c523fb11e9b1d2af0 /.local/bin/pkgsrc
parent2114ca17b3507375816838bd3efdb4991dc0a758 (diff)
Small updates to pkgsrc
Diffstat (limited to '.local/bin/pkgsrc')
-rwxr-xr-x.local/bin/pkgsrc9
1 files changed, 5 insertions, 4 deletions
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()