From e42d401d0f379a6c6ec541eaf05682973abf4bf9 Mon Sep 17 00:00:00 2001
From: Luke Shumaker <LukeShu@sbcglobal.net>
Date: Mon, 18 Mar 2013 10:18:17 -0400
Subject: add a shlib, use .pbs-root and .pbs-package to identify directories

---
 pbs-package-merge | 9 ++-------
 1 file changed, 2 insertions(+), 7 deletions(-)

(limited to 'pbs-package-merge')

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
-- 
cgit v1.2.3-54-g00ecf