summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorNatanael Copa <ncopa@alpinelinux.org>2007-10-15 14:06:17 +0000
committerNatanael Copa <ncopa@alpinelinux.org>2007-10-15 14:06:17 +0000
commit838cb4b1494ab9c3cfc7c0a952aaf220625758df (patch)
tree89278c192a543a9795fafaf2ea61391cbf3acf96
parent4c6317c699e81251974c14c8ca452471db7f83e1 (diff)
downloadalpine-conf-838cb4b1494ab9c3cfc7c0a952aaf220625758df.tar.bz2
alpine-conf-838cb4b1494ab9c3cfc7c0a952aaf220625758df.tar.xz
clean up verbosity
-rw-r--r--lbu22
1 files changed, 11 insertions, 11 deletions
diff --git a/lbu b/lbu
index f10caa8..783cb15 100644
--- a/lbu
+++ b/lbu
@@ -213,25 +213,25 @@ cmd_package() {
# create tar archive
[ -f "$EXCLUDE_LIST" ] && excl="-X $EXCLUDE_LIST"
[ -f "$INCLUDE_LIST" ] && incl="-T $INCLUDE_LIST"
- if [ -z "$ENCRYPTION" ]; then
- tar $VERBOSE $excl $incl -c $currentlist \
- | gzip -c >"$tmppkg"
+ if [ -n "$VERBOSE" ]; then
+ echo "Archiving the following files:" >&2
+ # we dont want to mess the tar output with the
+ # password prompt. Lets get the tar output first.
+ tar $excl $incl -c -v $currentlist > /dev/null
rc=$?
- else
- if [ -n "$VERBOSE" ]; then
- echo "Archiving the following files:" >&2
- # we dont want to mess the tar output with the
- # password prompt. Lets get the tar output first.
- tar $excl $incl -c -v $currentlist > /dev/null
+ fi
+ if [ $rc -eq 0 ]; then
+ if [ -z "$ENCRYPTION" ]; then
+ tar $excl $incl -c $currentlist | gzip -c >"$tmppkg"
rc=$?
- fi
- if [ $rc -eq 0 ]; then
+ else
tar $excl $incl -c $currentlist | gzip -c \
| $OPENSSL enc "-$ENCRYPTION" -salt > "$tmppkg"
rc=$?
fi
fi
+ # actually commit unless dryrun mode
if [ $rc -eq 0 ]; then
[ -z "$DRYRUN" ] && cp "$tmppkg" "$pkg"
else