Merge branch 'master' of vparabola:~/projects/libretools

2 files changed, 15 insertions, 11 deletions

diff --git a/librerepkg b/librerepkg
index 11962ff..5125023 100755
--- a/librerepkg
+++ b/librerepkg
@@ -47,13 +47,17 @@ while getopts 'h' arg; do
     esac
 done
 
-stdnull "tempdir=$(mktemp -d /tmp/$(basename $PWD).XXXXX)"
+tempdir=$(mktemp -d /tmp/$(basename $PWD).XXXXX)
 
 msg "Repackaging: $pkgname $pkgver-$pkgrel ($(date -u))"
 cp ./* ${tempdir}/
-stdnull "pushd ${tempdir}"
+
+stdnull pushd ${tempdir}
+
 msg2 "Updating md5sums"
-makepkg -gp rePKGBUILD >> PKGBUILD
+makepkg -gp rePKGBUILD >> rePKGBUILD
+
 msg "Repackaging using makepkg"
-makepkg -Lcp rePKGBULD
-stdnull "popd ${tempdir}"
+makepkg -Lcp rePKGBUILD
+
+stdnull popd ${tempdir}
diff --git a/rePKGBUILD.proto b/rePKGBUILD.proto
index 17342ce..5ef53c1 100644
--- a/rePKGBUILD.proto
+++ b/rePKGBUILD.proto
@@ -6,17 +6,17 @@
 # Maintainer: Your Name <youremail@domain.com>
 source PKGBUILD
 unset build package md5sums source
-_repo=
+_repo= # Put the repo here
 source=(PKGBUILD
-	http://mirrors.kernel.org/archlinux/${_repo}/os/$CARCH/$pkgname-$pkgver.tar.gz
+	http://mirrors.kernel.org/archlinux/${_repo}/os/${CARCH}/${pkgname%-libre}-$pkgver-$pkgrel-$CARCH$PKGEXT
 	# files for pkg modifications
         )
 
 build() {
   cd "${srcdir}/"
-  rm .{INSTALL,PKGINFO} $_pkgbase-$pkgver-$_pkgrel-$CARCH.pkg.tar.xz
-  # actions for package modifications
-  # be sure to remove source files
+  rm .{INSTALL,PKGINFO} ${pkgname%-libre}-$pkgver-$pkgrel-$CARCH$PKGEXT
+  # put actions for package modifications below this line
+
 }
 
 package() {
@@ -25,4 +25,4 @@ package() {
 }
 
 
-# vim:set ts=2 sw=2 et:
\ No newline at end of file
+# vim:set ts=2 sw=2 et: