mirror of
https://github.com/deajan/obackup.git
synced 2024-12-25 15:03:41 +01:00
Re enabled gpg fix
This commit is contained in:
parent
da5d98e922
commit
e59fcdbe15
@ -10,7 +10,7 @@ PROGRAM="obackup"
|
|||||||
AUTHOR="(C) 2013-2016 by Orsiris de Jong"
|
AUTHOR="(C) 2013-2016 by Orsiris de Jong"
|
||||||
CONTACT="http://www.netpower.fr/obackup - ozy@netpower.fr"
|
CONTACT="http://www.netpower.fr/obackup - ozy@netpower.fr"
|
||||||
PROGRAM_VERSION=2.1-dev
|
PROGRAM_VERSION=2.1-dev
|
||||||
PROGRAM_BUILD=2016090403
|
PROGRAM_BUILD=2016090404
|
||||||
IS_STABLE=no
|
IS_STABLE=no
|
||||||
|
|
||||||
source "./ofunctions.sh"
|
source "./ofunctions.sh"
|
||||||
@ -1038,17 +1038,18 @@ function DecryptFiles {
|
|||||||
exit 1
|
exit 1
|
||||||
fi
|
fi
|
||||||
|
|
||||||
#TODO: This is an Fix: gpg 1.4.11 fails with passphrase-file but not with passphrase $(cat file)
|
TODO: ugly fix : gpg 1.4.x fails with passphrase-file but not with passphrase (error is: can't query passphrase in batch mode)
|
||||||
#if [ "$CRYPT_TOOL" == "gpg2" ] && [ -f "$passphraseFile" ]; then
|
if [ "$CRYPT_TOOL" == "gpg2" ] && [ -f "$passphraseFile" ]; then
|
||||||
# secret="--passphrase-file $passphraseFile"
|
|
||||||
#elif [ "$CRYPT_TOOL" == "gpg" ] && [ -f "$passphraseFile" ]; then
|
|
||||||
# secert="$$passphrase $(cat "$passphraseFile")"
|
|
||||||
if [ -f "$passphraseFile" ]; then
|
|
||||||
secret="--passphrase-file $passphraseFile"
|
secret="--passphrase-file $passphraseFile"
|
||||||
|
elif [ "$CRYPT_TOOL" == "gpg" ] && [ -f "$passphraseFile" ]; then
|
||||||
|
secret="$$passphrase $(cat "$passphraseFile")"
|
||||||
|
|
||||||
|
#if [ -f "$passphraseFile" ]; then
|
||||||
|
# secret="--passphrase-file $passphraseFile"
|
||||||
elif [ "$passphrase" != "" ]; then
|
elif [ "$passphrase" != "" ]; then
|
||||||
secret="--passphrase $passphrase"
|
secret="--passphrase $passphrase"
|
||||||
else
|
else
|
||||||
Logger "Invalid passphrase file or passphrase." "CRITICAL"
|
Logger "The given passphrase file or passphrase are inexistent." "CRITICAL"
|
||||||
exit 1
|
exit 1
|
||||||
fi
|
fi
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user