summaryrefslogtreecommitdiff
path: root/pbs-package-merge
diff options
context:
space:
mode:
Diffstat (limited to 'pbs-package-merge')
-rwxr-xr-xpbs-package-merge9
1 files changed, 2 insertions, 7 deletions
diff --git a/pbs-package-merge b/pbs-package-merge
index f99484b..eca9d1b 100755
--- a/pbs-package-merge
+++ b/pbs-package-merge
@@ -1,6 +1,6 @@
#!/bin/bash -euE
-. libremessages
+. pbs-plumb-shlib
cmd=${0##*/}
usage() {
@@ -27,12 +27,7 @@ main() {
return 1
fi
- if ! git rev-parse --git-dir &>/dev/null; then
- error "Must be in a package (git) directory"
- return 1
- fi
- cd "$(git rev-parse --show-cdup)"
-
+ cdto_pbs-package-root
if [[ ! -r pbstrack ]]; then
error "No pbstrack file found, don't know where to pull from"
return 1