summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJoshua Ismael Haase Hernández <hahj87@gmail.com>2010-11-04 12:54:44 -0600
committerJoshua Ismael Haase Hernández <hahj87@gmail.com>2010-11-04 12:54:44 -0600
commit8e395c7e805fde0181022dbce1303456ab1758d0 (patch)
tree2903879bd1bc67447134852e0d660467a7914f5f
parent594dbd1e9c45b98f846cfc95a6fa0b6857720139 (diff)
parent90fd2556f0905fc370ebc3823afca21be2387b0b (diff)
Merge branch 'master' of parabolagnulinux.org:~/projects/libretools
-rwxr-xr-xlibremakepkg2
-rwxr-xr-xlibrerelease10
2 files changed, 6 insertions, 6 deletions
diff --git a/libremakepkg b/libremakepkg
index 7197816..1053872 100755
--- a/libremakepkg
+++ b/libremakepkg
@@ -26,7 +26,7 @@ fi
source /etc/libretools.conf
echo "Updating the main chroot"
-mkarchroot -u -c ${CACHEDIR} ${CHROOTDIR}/${CHROOT}
+mkarchroot -u -c ${CACHEDIR} -- ${CHROOTDIR}/${CHROOT}
echo "Creating the package"
makechrootpkg -c -r ${CHROOTDIR} -l ${CHCOPY} -- $@
diff --git a/librerelease b/librerelease
index b53b9d8..8b8f5c8 100755
--- a/librerelease
+++ b/librerelease
@@ -61,26 +61,26 @@ if [ -e ~/.makepkg.conf ]; then source ~/.makepkg.conf; fi
PKGDEST=${PKGDEST:-.}
SRCPKGDEST=${SRCPKGDEST:-.}
-
# Init the batchfile
to_sftp "progress"
-# Move out the old packages
-
for _arch in ${arch[@]}; do
for pkg in ${pkgname[@]}; do
pkgfile="$PKGDEST/$pkg-$pkgver-$pkgrel-$_arch$PKGEXT"
if [ -e "$pkgfile" ]; then
+# Move out the old packages
# This has to be moved to repo-maintainer
- ssh parabola mv ${PARABOLAHOST}/$repo/os/$_arch/$pkg-*-*-$_arch$PKGEXT ${LIBREDESTDIR}/old/
+ ssh ${PARABOLAHOST} mv ${LIBREDESTDIR}/$repo/os/$_arch/$pkg-*-*-$_arch$PKGEXT ${LIBREDESTDIR}/old/
to_sftp "put $pkgfile ${LIBREDESTDIR}/$repo/os/$_arch/"
fi
done
done
+# Use pkgbase for the finding the sources tar
+[[ ! -z ${pkgbase} ]] && pkgbase=${pkgname}
makepkg --source
-to_sftp "put $SRCPKGDEST/$pkgname-$pkgver-$pkgrel$SRCEXT ${LIBRESRCDIR}/$repo"
+to_sftp "put $SRCPKGDEST/$pkgbase-$pkgver-$pkgrel$SRCEXT ${LIBRESRCDIR}/$repo"
sftp -b ${batchfile} ${PARABOLAHOST}