Merge changed from other puter.

Fix return value snafus, etc.

1 files changed, 13 insertions, 10 deletions

diff --git a/bin/genpkg b/bin/genpkg
index 904de8c..e17b984 100755
--- a/bin/genpkg
+++ b/bin/genpkg
@@ -10,29 +10,28 @@ vard=~/var
 if [ $# -lt 1 ]
 then
 	echo "usage: $prog [package name]" 1>&2
-	exit 1
+	exit 2
 fi
 
 if ! [ -d "$tweakd" ]
 then
 	echo "$prog: bad package tweaks dir: $tweakd" 1>&2
-	exit 2
+	exit 1
 fi
 
 if ! [ -d "$pkgd" ]
 then
 	echo "$prog: bad package dest dir: $pkgd" 1>&2
-	exit 2
+	exit 1
 fi
 
 if ! [ -d "$vard" ]
 then
 	echo "$prog: bad package var dir: $vard" 1>&2
-	exit 2
+	exit 1
 fi
 
 cwd=$(pwd)
-set -e
 
 for pkg
 do
@@ -40,15 +39,19 @@ do
 	cd "$pkgd/$pkg"
 
 	METABIN=$libd/metas PKGVAR=$vard makepkgmeta "$pkg" >PKGMETA
-    case $? in
-    0)	echo "Generated $pkgd/$pkg/PKGMETA" ;;
-    *)	exit $?
-    esac
+	case $? in
+	0)	echo "Generated $pkgd/$pkg/PKGMETA" ;;
+	*)	exit $?
+	esac
 
 	twk=$tweakd/$pkg
 	if [ -f "$twk" -a -r "$twk" ]
 	then
-		tweakmeta >PKGMETA.new <$twk
+		if ! tweakmeta >PKGMETA.new <$twk
+		then
+			rm PKGMETA.new
+			exit 1
+		fi
 		mv PKGMETA.new PKGMETA
 		echo "Tweaked PKGMETA with $tweakd/$pkg."
 	fi