Linux/obackup
1
0
Fork 0
mirror of https://github.com/deajan/obackup.git synced 2024-11-15 04:03:41 +01:00
Code Issues Releases Wiki Activity

On the gpg 2.1.11 fix route

Browse Source
This commit is contained in:
deajan 2020-05-04 11:35:16 +01:00
parent ac7f0376f5
commit a47771964c
2 changed files with 7 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
dev/n_obackup.sh
View File

@ -1335,7 +1335,11 @@ function DecryptFiles {
cryptToolSubVersion=${cryptToolSubVersion%.*} cryptToolSubVersion=${cryptToolSubVersion%.*}
if [ $cryptToolMajorVersion -eq 2 ] && [ $cryptToolSubVersion -ge 1 ]; then if [ $cryptToolMajorVersion -eq 2 ] && [ $cryptToolSubVersion -ge 1 ]; then
additionalParameters="--pinentry-mode loopback" if [ $cryptToolMinorVersion -gt 11 ]; then
additionalParameters="--pinentry-mode loopback"
elif [ $cryptToolMinorVersion -eq 11 ]; then
Logger "GPG automatism via --pinentry-mode loopback not supported in gpg version 2.1.11. Please add allow-loopback-pinentry to your gpg-agent.conf file." "NOTICE"
fi
fi fi
if [ -f "$passphraseFile" ]; then if [ -f "$passphraseFile" ]; then

4
dev/tests/run_tests.sh
View File

@ -349,8 +349,8 @@ function test_GPG () {
additionalParameters="--pinentry-mode loopback" additionalParameters="--pinentry-mode loopback"
elif [ $cryptToolMinorVersion -eq 11 ]; then elif [ $cryptToolMinorVersion -eq 11 ]; then
echo "Using fix to allow --pinentry-mode loopback" echo "Using fix to allow --pinentry-mode loopback"
[ -f "{$HOME}/.gnupg/gpg-agent.conf" ] || touch "{$HOME}/.gnupg/gpg-agent.conf" [ -f "${HOME}/.gnupg/gpg-agent.conf" ] || touch "${HOME}/.gnupg/gpg-agent.conf"
echo "allow-loopback-pinentry" >> "{$HOME}/.gnupg/gpg-agent.conf" echo "allow-loopback-pinentry" >> "${HOME}/.gnupg/gpg-agent.conf"
gpgconf --reload gpg-agent gpgconf --reload gpg-agent
else else
echo "Not using --pinentry-mode loopback [$cryptToolMajorVersion.$cryptToolSubVersion.$cryptToolMinorVersion]" echo "Not using --pinentry-mode loopback [$cryptToolMajorVersion.$cryptToolSubVersion.$cryptToolMinorVersion]"