From 3bf5718c1f04a622d457ad0568ba8ba165bdbb67 Mon Sep 17 00:00:00 2001 From: Joshua Ismael Haase Hernández Date: Sun, 13 Feb 2011 22:47:08 -0600 Subject: * Updated parabola host recommendation. * Fixed librerelease to play with db-update in repo. --- librerelease | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'librerelease') diff --git a/librerelease b/librerelease index ad083a3..707ebca 100755 --- a/librerelease +++ b/librerelease @@ -34,7 +34,7 @@ rsync --recursive \ --progress \ -e "ssh " \ ${WORKDIR}/staging \ - ${PARABOLAHOST}:${LIBREDESTDIR} || exit 1 + ${PARABOLAHOST}:${LIBREDESTDIR}/stagging || exit 1 echo ":: Removing packages from local [staging]" find ${WORKDIR}/staging/ -iname "*.pkg.tar.*" -delete -- cgit v1.2.3-54-g00ecf From 700e3da385b35228d43a64501850a6ebad83293c Mon Sep 17 00:00:00 2001 From: Joshua Ismael Haase Hernández Date: Sun, 13 Feb 2011 23:19:41 -0600 Subject: Fixed typo --- librerelease | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'librerelease') diff --git a/librerelease b/librerelease index 707ebca..6762a68 100755 --- a/librerelease +++ b/librerelease @@ -34,7 +34,7 @@ rsync --recursive \ --progress \ -e "ssh " \ ${WORKDIR}/staging \ - ${PARABOLAHOST}:${LIBREDESTDIR}/stagging || exit 1 + ${PARABOLAHOST}:${LIBREDESTDIR}/staging || exit 1 echo ":: Removing packages from local [staging]" find ${WORKDIR}/staging/ -iname "*.pkg.tar.*" -delete -- cgit v1.2.3-54-g00ecf From 650b2065bd9197e3ecc1a9a14165e638322b178e Mon Sep 17 00:00:00 2001 From: Joshua Ismael Haase Hernández Date: Mon, 14 Feb 2011 00:07:45 -0600 Subject: Another try --- librerelease | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'librerelease') diff --git a/librerelease b/librerelease index 6762a68..7bf5003 100755 --- a/librerelease +++ b/librerelease @@ -34,7 +34,7 @@ rsync --recursive \ --progress \ -e "ssh " \ ${WORKDIR}/staging \ - ${PARABOLAHOST}:${LIBREDESTDIR}/staging || exit 1 + ${PARABOLAHOST}:${LIBREDESTDIR}/ || exit 1 echo ":: Removing packages from local [staging]" find ${WORKDIR}/staging/ -iname "*.pkg.tar.*" -delete -- cgit v1.2.3-54-g00ecf From 10547b604665db1eebc7325ae181c2d3b5f300ec Mon Sep 17 00:00:00 2001 From: Nicolás Reynolds Date: Thu, 10 Mar 2011 16:01:52 -0300 Subject: LibreStage just copies once and hardlinks the rest if the package is going to be released into two repos. --- librerelease | 1 + librestage | 33 ++++++++++++++++++++++----------- 2 files changed, 23 insertions(+), 11 deletions(-) (limited to 'librerelease') diff --git a/librerelease b/librerelease index 7bf5003..f592b9e 100755 --- a/librerelease +++ b/librerelease @@ -28,6 +28,7 @@ custom_config=$XDG_CONFIG_HOME/libretools/libretools.conf echo ":: Uploading packages..." rsync --recursive \ --copy-links \ + --hard-links \ --partial \ --prune-empty-dirs \ --human-readable \ diff --git a/librestage b/librestage index 933a7e7..70aaa4a 100755 --- a/librestage +++ b/librestage @@ -66,23 +66,34 @@ SRCPKGDEST=${SRCPKGDEST:-.} # Copies the packages to the specified repos inside staging for _arch in ${arch[@]}; do for pkg in ${pkgname[@]}; do + pkgfile="$pkg-$pkgver-$pkgrel-$_arch$PKGEXT" + pkgpath="$PKGDEST/$pkgfile" - pkgfile="$PKGDEST/$pkg-$pkgver-$pkgrel-$_arch$PKGEXT" + if [ -e "${pkgpath}" ]; then + echo found ${pkgfile} - if [ -e "${pkgfile}" ]; then - echo found ${pkgfile} + canonical="" for _repo in ${repos[@]}; do - cp "${pkgfile}" "${WORKDIR}/staging/${_repo}/" || { - echo "Can't put ${pkgfile} on [staging]" - exit 1 - } && { - echo "${pkg} staged on [${_repo}]" - } + [[ -z "$canonical" ]] && { + canonical="${WORKDIR}/staging/${_repo}/${pkgfile}" + cp "${pkgpath}" "${WORKDIR}/staging/${_repo}/" || { + echo "Can't put ${pkgfile} on [staging]" + exit 1 + } && { + echo "${pkg} staged on [${_repo}]" + } + } || { + ln "${canonical}" "${WORKDIR}/staging/${_repo}/${pkgfile}" || { + echo "Can't put ${pkgfile} on [staging]" + exit 1 + } && { + echo "${pkg} staged on [${_repo}]" + } + } done - fi done done -exit 0 \ No newline at end of file +exit 0 -- cgit v1.2.3-54-g00ecf From de28a019385b3a4465ffeadf39e51f0411771edf Mon Sep 17 00:00:00 2001 From: Nicolás Reynolds Date: Thu, 10 Mar 2011 16:55:01 -0300 Subject: LibreRelease run a command before syncing --- librerelease | 2 ++ libretools.conf | 3 +++ 2 files changed, 5 insertions(+) (limited to 'librerelease') diff --git a/librerelease b/librerelease index f592b9e..900cad3 100755 --- a/librerelease +++ b/librerelease @@ -25,6 +25,8 @@ source /etc/libretools.conf custom_config=$XDG_CONFIG_HOME/libretools/libretools.conf [[ -e $custom_config ]] && source $custom_config +[[ ! -z ${HOOKPRERELEASE} ]] && bash -c "${HOOKPRERELEASE}" + echo ":: Uploading packages..." rsync --recursive \ --copy-links \ diff --git a/libretools.conf b/libretools.conf index d8850bd..a3fd4b8 100644 --- a/libretools.conf +++ b/libretools.conf @@ -26,6 +26,9 @@ PATCHDIR=${WORKDIR}/abslibre/patches ## Parabola hostname (should be the same used on ssh_config PARABOLAHOST=parabola +## Run a command before releasing a package (ie. SSH connection, SSH tunnel, etc.) +HOOKPRERELEASE="ssh -fN parabola" + ## Server destination of libre packages LIBREDESTDIR=/home/parabolavnx/parabolagnulinux.org/free LIBRESRCDIR=/home/parabolavnx/parabolagnulinux.org/repo/pkgbuilds -- cgit v1.2.3-54-g00ecf