Commit e1674279 authored by Natanael Copa's avatar Natanael Copa

dont override with default encryption if ENCRYPTION is set in lbu.conf. fixed...

dont override with default encryption if ENCRYPTION is set in lbu.conf. fixed typo in help text. Thanks to Alexander Poslavsky
parent 22fd8180
V=1.1
V=1.1.1
P=alpine-conf
PV=$(P)-$(V)
APKF=$(PV).apk
......
......@@ -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
;;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment