Merge branch 'master' of ssh://vparabola/srv/git/projects/libretools

Conflicts:
	libremessages

1 files changed, 48 insertions, 13 deletions

diff --git a/librerelease b/librerelease
index 39d3e2d..4e7c491 100755
--- a/librerelease
+++ b/librerelease
@@ -24,29 +24,64 @@
 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 packages on $WORKDIR/staging.")"
+}
+
+function list_packages {
+    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.?z" -delete
 }
 
+function clean_packages {
+    find ${WORKDIR}/staging/ -iname "*.pkg.tar.?z" -delete
+}
+
+while getopts 'hlc' 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