Test now is working again

plyint · Jan 9, 2020 · 8f11c85 · 8f11c85
1 parent d1d00db
commit 8f11c85
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 4 deletions.
diff --git a/encpass.sh b/encpass.sh
@@ -114,10 +114,10 @@ set_secret() {
 	if [ "$SECRET" = "$CSECRET" ]; then
 		printf "%s" "$(openssl rand -hex 16)" >"$SECRET_DIR/$SECRET_NAME.enc"
 
+		# shellcheck disable=SC2094
 		echo "$SECRET" | openssl enc -aes-256-cbc -e -a -iv \
 			"$(cat "$SECRET_DIR/$SECRET_NAME.enc")" -K \
-			"$(cat "$ENCPASS_HOME_DIR/keys/$LABEL/private.key")" 1>>"$SECRET_DIR/$SECRET_NAME.enc_" &&
-			mv "$SECRET_DIR/$SECRET_NAME.enc_" "$SECRET_DIR/$SECRET_NAME.enc"
+			"$(cat "$ENCPASS_HOME_DIR/keys/$LABEL/private.key")" 1>>"$SECRET_DIR/$SECRET_NAME.enc"
 	else
 		echo "Error: secrets do not match.  Please try again." >&2
 		exit 1

diff --git a/tests/Dockerfile b/tests/Dockerfile
@@ -1,7 +1,7 @@
 FROM ubuntu:18.04
 
-RUN apt-get update &&
-    apt-get install -qy zsh ksh expect openssl
+RUN apt-get update \
+    && apt-get install -qy zsh ksh expect openssl
 
 RUN mkdir /opt/encpass