From c6f386bf015bd6da94def091e5d08ad506f4f968 Mon Sep 17 00:00:00 2001 From: deajan Date: Sun, 4 Sep 2016 22:25:24 +0200 Subject: [PATCH] Trying to resolve Travis GPG mystery --- dev/n_obackup.sh | 4 +++- dev/tests/run_tests.sh | 2 +- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/dev/n_obackup.sh b/dev/n_obackup.sh index 4090911..ea5a073 100755 --- a/dev/n_obackup.sh +++ b/dev/n_obackup.sh @@ -1054,7 +1054,9 @@ function DecryptFiles { while IFS= read -r -d $'\0' encryptedFile; do Logger "Decrypting [$encryptedFile]." "VERBOSE" - $CRYPT_TOOL --out "${encryptedFile%%$cryptFileExtension}" --batch --yes $secret --decrypt "$encryptedFile" > "$RUN_DIR/$PROGRAM.${FUNCNAME[0]}.$SCRIPT_PID" 2>&1 + #$CRYPT_TOOL --out "${encryptedFile%%$cryptFileExtension}" --batch --yes $secret --decrypt "$encryptedFile" > "$RUN_DIR/$PROGRAM.${FUNCNAME[0]}.$SCRIPT_PID" 2>&1 + #WIP trying to resolve travis GPG mystery + $CRYPT_TOOL --out "${encryptedFile%%$cryptFileExtension}" --batch --yes $secret --decrypt "$encryptedFile" if [ $? != 0 ]; then Logger "Cannot decrypt [$encryptedFile]." "ERROR" Logger "Command output\n$(cat $RUN_DIR/$PROGRAM.${FUNCNAME[0]}.$SCRIPT_PID)" "DEBUG" diff --git a/dev/tests/run_tests.sh b/dev/tests/run_tests.sh index 6cf8532..775564e 100755 --- a/dev/tests/run_tests.sh +++ b/dev/tests/run_tests.sh @@ -231,7 +231,7 @@ function test_GPG () { assertEquals "Decrypt file using passphrase" "0" $? echo "Decrypt using passphrase file --no-use-agent" - $CRYPT_TOOL --out "$TESTS_DIR/$CRYPT_TEST_FILE" --no-use-agent --batch --yes --passphrase-file="TESTS_DIR/$PASSFILE" --decrypt "$TESTS_DIR/$CRYPT_TEST_FILE$CRYPT_EXTENSION" + $CRYPT_TOOL --out "$TESTS_DIR/$CRYPT_TEST_FILE" --no-use-agent --batch --yes --passphrase-file="$TESTS_DIR/$PASSFILE" --decrypt "$TESTS_DIR/$CRYPT_TEST_FILE$CRYPT_EXTENSION" assertEquals "Decrypt file using passphrase" "0" $? echo "Decrypt using passphrase --no-use-agent"