From e167427963d3cd7899bce8a55c7ec5b6907d8fdf Mon Sep 17 00:00:00 2001
From: Natanael Copa <ncopa@alpinelinux.org>
Date: Thu, 18 Oct 2007 14:18:47 +0000
Subject: [PATCH] dont override with default encryption if ENCRYPTION is set in
 lbu.conf. fixed typo in help text. Thanks to Alexander Poslavsky

---
 Makefile | 2 +-
 lbu      | 5 +++--
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/Makefile b/Makefile
index 1dc5d0a..509af6c 100644
--- a/Makefile
+++ b/Makefile
@@ -1,4 +1,4 @@
-V=1.1
+V=1.1.1
 P=alpine-conf
 PV=$(P)-$(V)
 APKF=$(PV).apk
diff --git a/lbu b/lbu
index 987bffc..ce8445f 100644
--- a/lbu
+++ b/lbu
@@ -287,7 +287,7 @@ used by setting the DEFAULT_CIPHER or ENCRYPTION environment variables.
 For possible ciphers, try: openssl -v
 
 The password used to encrypt the file, can either be specified on the command line
-(following -p) or using the ENCRYPTION environment variable in /etc/lbu/lbu.conf
+(following -p) or using the PASSWORD environment variable in /etc/lbu/lbu.conf
 
 The environment varialbes can also be set in $LBU_CONF
 "
@@ -370,6 +370,7 @@ cmd_commit() {
 
 	# move current to commited.
 	[ "$DRYRUN" ] || mv "$CURRENT_TDB" "$COMMITED_TDB"
+	vecho "Successfully saved apk overlay files"
 }
 
 #---------------------------------------------------------------------------
@@ -512,7 +513,7 @@ while getopts "adehlM:np:qrv" opt ; do
 			;;
 		d)	DELETEOLDCONFIGS="yes"
 			;;
-		e)	ENCRYPTION="$DEFAULT_CIPHER"
+		e)	[ -z "$ENCRYPTION" ] && ENCRYPTION="$DEFAULT_CIPHER"
 			;;
 		h) 	usage_$SUBCMD
 			;;
-- 
GitLab