summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJoshua Ismael Haase Hernández <hahj87@gmail.com>2011-06-02 01:27:30 -0500
committerJoshua Ismael Haase Hernández <hahj87@gmail.com>2011-06-02 01:27:30 -0500
commit316df77571259583d0810cb1f1c3bc3b0ccdd0d5 (patch)
tree5d0748c0b961d3aeb6782e0b04115b6439d1c558
parentb5101d5a422f84bdbad90ff5859410c831d4c6e8 (diff)
_dir in find_deps is an array
-rwxr-xr-xfullpkg-ng8
1 files changed, 4 insertions, 4 deletions
diff --git a/fullpkg-ng b/fullpkg-ng
index 9db75a2..537a7ca 100755
--- a/fullpkg-ng
+++ b/fullpkg-ng
@@ -79,7 +79,7 @@ check_queue() {
local packager=$(grep -w "$(basename $PWD)" ${queue_file} | cut -d ':' -f2)
- [ -n $packager -a "$packager" != "$PACKAGER" ] && {
+ [ -n "$packager" -a "$packager" != "$PACKAGER" ] && {
warning "$(basename $PWD) is being packaged by $packager. Please wait."
return 1
}
@@ -103,7 +103,7 @@ function cleanup {
rm -rf $build_dir/$_dir/
done
else
- rm -rf $build_dir
+ rm -rf $build_dir/*
fi
}
@@ -155,8 +155,8 @@ function find_deps {
break 1 # found, go to next dep
# if search pkgname in repo doesn't work
# this should find pkgsplits
- elif _dir=$(find "$ABSROOT/${_repo}" -type f -name PKGBUILD -print0 | \
- "xargs" -0 -e grep -HEw "pkgname|pkgbase" | grep $_dep 2>&1) \
+ elif _dir=($(find "$ABSROOT/${_repo}" -type f -name PKGBUILD -print0 | \
+ "xargs" -0 -e grep -HEw "pkgbase|pkgname|provides" | grep $_dep 2>&1))
[ -n "$_dir" ]; then
pushd $(dirname $(echo $_dir | cut -d: -f1)) > /dev/null
$0 -c -d ${build_dir} -l ${next_level}