diff options
| author | Natanael Copa <ncopa@alpinelinux.org> | 2007-10-18 14:18:47 +0000 |
|---|---|---|
| committer | Natanael Copa <ncopa@alpinelinux.org> | 2007-10-18 14:18:47 +0000 |
| commit | e167427963d3cd7899bce8a55c7ec5b6907d8fdf (patch) | |
| tree | cec875e6b9c497a88609b272f68da6958cbf410d | |
| parent | 22fd8180313c40b313e62941348db03e8592afab (diff) | |
| download | alpine-conf-e167427963d3cd7899bce8a55c7ec5b6907d8fdf.tar.bz2 alpine-conf-e167427963d3cd7899bce8a55c7ec5b6907d8fdf.tar.xz | |
dont override with default encryption if ENCRYPTION is set in lbu.conf. fixed typo in help text. Thanks to Alexander Poslavsky
| -rw-r--r-- | Makefile | 2 | ||||
| -rw-r--r-- | lbu | 5 |
2 files changed, 4 insertions, 3 deletions
@@ -1,4 +1,4 @@ -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 ;; |