fullpkg: -b (build_only) skips first PKGBUILD check, and takes $build_dir as $optarg

mipsrelease has usage and get_full_version

1 files changed, 22 insertions, 1 deletions

diff --git a/mipsrelease b/mipsrelease
index a4e4394..a21eaec 100755
--- a/mipsrelease
+++ b/mipsrelease
@@ -10,18 +10,39 @@
 source /etc/makepkg.conf
 source /etc/libretools.conf
 
+usage() {
+    echo "$0 repo package1 [ package2 ... packageN ]"
+    echo
+    echo " release packages locally on ${PKGDEST}/stage3."
+    echo " and make a clean ABS sync "
+}
+
+##
+#  usage : get_full_version( $epoch, $pkgver, $pkgrel )
+# return : full version spec, including epoch (if necessary), pkgver, pkgrel
+##
+get_full_version() {
+	if [[ $1 -eq 0 ]]; then
+		# zero epoch case, don't include it in version
+		echo $2-$3
+	else
+		echo $1:$2-$3
+	fi
+}
+
 repo=$1; shift
 
 repo-add ${PKGDEST}/stage3.db.tar.gz $@ 
 
 # Get all needed sources
 source PKGBUILD
+fullver=$(get_full_version ${epoch:-0} ${pkgver} ${pkgrel})
 makepkg --source
 
 mkdir -p ${WORKDIR}/abs/${CARCH}/${repo} >/dev/null
 
 pushd ${WORKDIR}/abs/${CARCH}/${repo} >/dev/null
-  tar xvf $SRCPKGDEST/${pkgbase:-${pkgname[0]}}-${pkgver}-${pkgrel}${SRCEXT}
+  tar xvf $SRCPKGDEST/${pkgbase:-${pkgname[0]}}-${fullver}${SRCEXT}
 popd >/dev/null
 
 exit $?