From 7f118f53283d7e228c40a40076815ce94ebb94a7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Joshua=20Ismael=20Haase=20Hern=C3=A1ndez?= Date: Mon, 16 May 2011 00:44:39 -0500 Subject: Cleaned up some things, added option parse to some scripts. --- librerelease | 56 +++++++++++++++++++++++++++++++++++++++++++------------- 1 file changed, 43 insertions(+), 13 deletions(-) (limited to 'librerelease') diff --git a/librerelease b/librerelease index 39d3e2d..2359de8 100755 --- a/librerelease +++ b/librerelease @@ -24,29 +24,59 @@ source /etc/libretools.conf custom_config=$XDG_CONFIG_HOME/libretools/libretools.conf -usage () { - printf "$(gettext "Usage: %s")" "$0" +function usage { + echo "$(gettext "Usage: $0")" echo - printf "$(gettext "This script")" + echo "$(gettext "This script uploads packages on $WORKDIR/stagging")" + echo "$(gettext "to parabola server.")" + echo + echo "$(gettext "OPTIONS:")" + echo "$(gettext " -h this message.")" + echo "$(gettext " -l only list packages but not upload them.")" + echo "$(gettext " -c clean $WORKDIR/staging.")" +} + +function list_packages { + find $WORKDIR/staging/ -type f -print0 +} + +function clean_non_packages { + find $WORKDIR/staging/ -type -f \! -iname "*.pkg.tar.*" -delete } +function clean_packages { + find ${WORKDIR}/staging/ -iname "*.pkg.tar.*" -delete +} + +while getopts 'hl' arg; do + case $arg in + h) usage; exit 0 ;; + l) list_packages; exit 0 ;; + c) clean_packages; exit $? ;; + esac +done + [[ -e $custom_config ]] && source $custom_config [[ ! -z ${HOOKPRERELEASE} ]] && bash -c "${HOOKPRERELEASE}" +clean_non_packages msg "Uploading packages..." rsync --recursive \ - --copy-links \ - --hard-links \ - --partial \ - --prune-empty-dirs \ - --human-readable \ - --progress \ - -e "ssh " \ - ${WORKDIR}/staging \ - ${PARABOLAHOST}:${LIBREDESTDIR}/ || exit 1 + --copy-links \ + --hard-links \ + --partial \ + --prune-empty-dirs \ + --human-readable \ + --progress \ + -e "ssh " \ + ${WORKDIR}/staging \ + ${PARABOLAHOST}:${LIBREDESTDIR}/ || { + error "Sync failed, try again" + exit 1 +} msg "Removing packages from local [staging]" -find ${WORKDIR}/staging/ -iname "*.pkg.tar.*" -delete +clean_packages exit 0 -- cgit v1.2.3-2-g168b From 1b59d6008a5a47969f3395ac7d68e1c0c22dcf43 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Joshua=20Ismael=20Haase=20Hern=C3=A1ndez?= Date: Mon, 16 May 2011 10:22:09 -0500 Subject: librestage to use arch from pkgbuild librerelease to print nice format --- librerelease | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'librerelease') diff --git a/librerelease b/librerelease index 2359de8..1e323c3 100755 --- a/librerelease +++ b/librerelease @@ -37,7 +37,7 @@ function usage { } function list_packages { - find $WORKDIR/staging/ -type f -print0 + find $WORKDIR/staging/ -type f -printf "%f\n" } function clean_non_packages { -- cgit v1.2.3-2-g168b From 254af17f2eb70468d4b1b5d385a2e8154b45ea87 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Joshua=20Ismael=20Haase=20Hern=C3=A1ndez?= Date: Mon, 16 May 2011 10:47:29 -0500 Subject: librerelease use c option for cleaning packages --- librerelease | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'librerelease') diff --git a/librerelease b/librerelease index 1e323c3..1505098 100755 --- a/librerelease +++ b/librerelease @@ -33,7 +33,7 @@ function usage { echo "$(gettext "OPTIONS:")" echo "$(gettext " -h this message.")" echo "$(gettext " -l only list packages but not upload them.")" - echo "$(gettext " -c clean $WORKDIR/staging.")" + echo "$(gettext " -c clean packages on $WORKDIR/staging.")" } function list_packages { @@ -48,7 +48,7 @@ function clean_packages { find ${WORKDIR}/staging/ -iname "*.pkg.tar.*" -delete } -while getopts 'hl' arg; do +while getopts 'hlc' arg; do case $arg in h) usage; exit 0 ;; l) list_packages; exit 0 ;; -- cgit v1.2.3-2-g168b From 451039258fa50b27488455329ac5fd93d3885847 Mon Sep 17 00:00:00 2001 From: Joshua Ismael Haase Hernandez Date: Wed, 18 May 2011 01:01:25 -0500 Subject: librerelease clean_non_packages fixed --- librerelease | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'librerelease') diff --git a/librerelease b/librerelease index 1505098..c34abaf 100755 --- a/librerelease +++ b/librerelease @@ -41,7 +41,7 @@ function list_packages { } function clean_non_packages { - find $WORKDIR/staging/ -type -f \! -iname "*.pkg.tar.*" -delete + find $WORKDIR/staging/ -type f \! -iname "*.pkg.tar.*" -delete } function clean_packages { -- cgit v1.2.3-2-g168b From 2e4d78c7768119a75bba8ae5eab98c1a6026ea89 Mon Sep 17 00:00:00 2001 From: Joshua Ismael Haase Hernandez Date: Thu, 19 May 2011 02:02:22 -0500 Subject: * fullpkg uses options and librerelease * librerelease tell wich repo for each pkg when listing --- librerelease | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) (limited to 'librerelease') diff --git a/librerelease b/librerelease index c34abaf..4e7c491 100755 --- a/librerelease +++ b/librerelease @@ -37,15 +37,20 @@ function usage { } function list_packages { - find $WORKDIR/staging/ -type f -printf "%f\n" + repos=($(find "$WORKDIR/staging/" -mindepth 1 -type d \! -empty -printf '%f ' 2>/dev/null)) + for _repo in ${repos[@]}; do + msg2 "$_repo" + find ${WORKDIR}/staging/${_repo} -type f -printf "%f\n" + done + unset repos } function clean_non_packages { - find $WORKDIR/staging/ -type f \! -iname "*.pkg.tar.*" -delete + find $WORKDIR/staging/ -type f \! -iname "*.pkg.tar.?z" -delete } function clean_packages { - find ${WORKDIR}/staging/ -iname "*.pkg.tar.*" -delete + find ${WORKDIR}/staging/ -iname "*.pkg.tar.?z" -delete } while getopts 'hlc' arg; do -- cgit v1.2.3-2-g168b