diff options
Diffstat (limited to 'pbs-package-merge')
| -rwxr-xr-x | pbs-package-merge | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/pbs-package-merge b/pbs-package-merge index b0fafc9..f99484b 100755 --- a/pbs-package-merge +++ b/pbs-package-merge @@ -27,11 +27,15 @@ main() { return 1 fi - if [[ ! -f .git ]]; then - error "Must be in a package directory" + 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)" + if [[ ! -r pbstrack ]]; then error "No pbstrack file found, don't know where to pull from" + return 1 fi git pull $(cat pbstrack) } |