summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLuke Shumaker <LukeShu@sbcglobal.net>2013-06-01 20:55:09 -0600
committerLuke Shumaker <LukeShu@sbcglobal.net>2013-06-05 20:01:05 -0600
commit1340e50d4dfcf091ce33ace8da471da1ea9489fb (patch)
treeed58ffc8bc64064cd9091af330e30330478f3924
parente40082d0d3e6ef4bc8df58879a066d3ec8ec6a9c (diff)
librerelease: use tab for indent
-rwxr-xr-xsrc/abslibre-tools/librerelease152
1 files changed, 76 insertions, 76 deletions
diff --git a/src/abslibre-tools/librerelease b/src/abslibre-tools/librerelease
index 4296bb1..8ba8741 100755
--- a/src/abslibre-tools/librerelease
+++ b/src/abslibre-tools/librerelease
@@ -29,87 +29,87 @@ check_vars libretools WORKDIR PARABOLAHOST LIBREDESTDIR SIGID || exit 1
#check_vars libretools SIGEXT HOOKPRERELEASE || exit 1
function usage {
- echo "$(gettext "Usage: $0")"
- echo
- 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.")"
- echo "$(gettext " -n dry-run")"
+ echo "$(gettext "Usage: $0")"
+ echo
+ 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.")"
+ echo "$(gettext " -n dry-run")"
}
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
+ 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 sign_packages {
- if [ -z "${SIGEXT}" ]; then
- SIGEXT=.sig
- warning "Empty SIGEXT var, using default .sig"
- fi
-
- if [ -z "${GPG_AGENT_INFO}" ]; then
- warning "It's better to use gpg-agent to sign packages in batches"
- fi
-
- packages=($(find "${WORKDIR}/staging/" -type f -iname '*.pkg.tar.?z'))
- for package in ${packages[@]}; do
- if [ -f "${package}${SIGEXT}" ]; then
-
- warning "Package signature found, verifying..."
-
- # Verify that the signature is correct, else remove for re-signing
- if ! gpg --quiet --verify "${package}${SIGEXT}" >/dev/null 2>&1; then
- error "Failed! Resigning..."
- rm -f "${package}${SIGEXT}"
- fi
- fi
-
- if ! [ -f "${package}${SIGEXT}" ]; then
- msg2 "Signing ${package}..."
- gpg --default-key "${SIGID}" --output "${package}${SIGEXT}" \
- --detach-sig "${package}" || {
- error "Signing failed"
- exit 2
- }
- fi
-
- done
+ if [ -z "${SIGEXT}" ]; then
+ SIGEXT=.sig
+ warning "Empty SIGEXT var, using default .sig"
+ fi
+
+ if [ -z "${GPG_AGENT_INFO}" ]; then
+ warning "It's better to use gpg-agent to sign packages in batches"
+ fi
+
+ packages=($(find "${WORKDIR}/staging/" -type f -iname '*.pkg.tar.?z'))
+ for package in ${packages[@]}; do
+ if [ -f "${package}${SIGEXT}" ]; then
+
+ warning "Package signature found, verifying..."
+
+ # Verify that the signature is correct, else remove for re-signing
+ if ! gpg --quiet --verify "${package}${SIGEXT}" >/dev/null 2>&1; then
+ error "Failed! Resigning..."
+ rm -f "${package}${SIGEXT}"
+ fi
+ fi
+
+ if ! [ -f "${package}${SIGEXT}" ]; then
+ msg2 "Signing ${package}..."
+ gpg --default-key "${SIGID}" --output "${package}${SIGEXT}" \
+ --detach-sig "${package}" || {
+ error "Signing failed"
+ exit 2
+ }
+ fi
+
+ done
}
# Remove everything that's not a package or a signature
function clean_non_packages {
- find $WORKDIR/staging/ -type f \
- \! -iname "*.pkg.tar.?z" -a \! -iname "*.pkg.tar.?z.sig" \
- -delete
+ find $WORKDIR/staging/ -type f \
+ \! -iname "*.pkg.tar.?z" -a \! -iname "*.pkg.tar.?z.sig" \
+ -delete
}
# Clean everything if not on dry-run mode
function clean {
- [ -z ${dryrun} ] && \
- rm -f $@
+ [ -z ${dryrun} ] && \
+ rm -f $@
}
if [ -w / ]; then
- error "Run $0 as normal user"
- exit 1
+ error "Run $0 as normal user"
+ exit 1
fi
while getopts 'hlcn' arg; do
- case $arg in
- h) usage; exit 0 ;;
- l) list_packages; exit 0 ;;
- c) clean; exit $? ;;
- n) dryrun="--dry-run" ;;
- esac
+ case $arg in
+ h) usage; exit 0 ;;
+ l) list_packages; exit 0 ;;
+ c) clean; exit $? ;;
+ n) dryrun="--dry-run" ;;
+ esac
done
[[ ! -z ${HOOKPRERELEASE} ]] && bash -c "${HOOKPRERELEASE}"
@@ -129,21 +129,21 @@ SYNCED_FILES=($(find ${WORKDIR}/staging -type f))
msg "%s to upload" $(du -h -d 0 ${WORKDIR}/staging | tr "\t" " " | cut -d" " -f1)
msg "Uploading packages..."
rsync --recursive \
- ${dryrun} \
- --no-group \
- --no-perms \
- --copy-links \
- --hard-links \
- --partial \
- --prune-empty-dirs \
- --human-readable \
- --progress \
- -e "ssh " \
- ${WORKDIR}/staging \
- ${PARABOLAHOST}:${LIBREDESTDIR}/ || {
- error "Sync failed, try again"
- exit 1
- }
+ ${dryrun} \
+ --no-group \
+ --no-perms \
+ --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 ${#SYNCED_FILES[@]} files from local [staging]"
clean ${SYNCED_FILES[@]}