summaryrefslogtreecommitdiffstats
path: root/bin
diff options
context:
space:
mode:
Diffstat (limited to 'bin')
-rwxr-xr-xbin/genpkg8
-rwxr-xr-xbin/makepkgmeta4
2 files changed, 9 insertions, 3 deletions
diff --git a/bin/genpkg b/bin/genpkg
index c933076..afd1f49 100755
--- a/bin/genpkg
+++ b/bin/genpkg
@@ -32,7 +32,6 @@ then
fi
cwd=$(pwd)
-set -e
for pkg
do
@@ -40,7 +39,12 @@ do
cd "$pkgd/$pkg"
METABIN=$libd/metas PKGVAR=$vard makepkgmeta "$pkg" >PKGMETA
- case $? in 1) rm PKGMETA ; exit 1 ;; esac
+ case $? in
+ 1) cd ..
+ rm -r "$pkgd/$pkg"
+ echo "$prog: aborting." 1>&2
+ exit 1
+ esac
echo "Generated $pkgd/$pkg/PKGMETA"
diff --git a/bin/makepkgmeta b/bin/makepkgmeta
index b6dfcff..82a7b1f 100755
--- a/bin/makepkgmeta
+++ b/bin/makepkgmeta
@@ -59,10 +59,12 @@ esac
for flav in "$METABIN"/*
do
[ -f "$flav" -a -x "$flav" ] || continue
- PATH="$PATH:$flav.d" "$flav" $1 | lazysource
+ PATH="$PATH:$flav.d" "$flav" $1 >PKGMETA.tmp
metaret=$?
case $metaret in
0) basicmeta $1
+ lazysource <PKGMETA.tmp
+ rm PKGMETA.tmp
exit 0 ;;
1) echo "makepkgmeta: $flav encountered an error" 1>&2
exit 1 ;;