From 133a65ceff1acd173c08dadb9cfc88d743041f0a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Nicol=C3=A1s=20Reynolds?= Date: Wed, 27 Oct 2010 22:10:21 -0300 Subject: Use pkgbase for finding the sources.tar.gz --- librerelease | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/librerelease b/librerelease index b53b9d8..c6ceb14 100755 --- a/librerelease +++ b/librerelease @@ -79,8 +79,10 @@ for _arch in ${arch[@]}; do 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} -- cgit v1.2.3 From 90fd2556f0905fc370ebc3823afca21be2387b0b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Nicol=C3=A1s=20Reynolds?= Date: Thu, 4 Nov 2010 13:04:47 -0300 Subject: libremakepkg fix librerelease fixed moving old packages --- libremakepkg | 2 +- librerelease | 6 ++---- 2 files changed, 3 insertions(+), 5 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 c6ceb14..8b8f5c8 100755 --- a/librerelease +++ b/librerelease @@ -61,18 +61,16 @@ 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 -- cgit v1.2.3