1
0
mirror of https://github.com/TheLocehiliosan/yadm synced 2024-10-27 20:34:27 +00:00

Remove legacy code which was reintroduced

This commit is contained in:
Tim Byrne 2020-02-28 07:38:49 -06:00
parent 0995f38b06
commit 778c33145c
No known key found for this signature in database
GPG Key ID: 14DB4FC2465A4B12

5
yadm
View File

@ -914,7 +914,7 @@ function _encrypt_to() {
gpg) gpg)
require_gpg require_gpg
#; Build gpg options for gpg # Build gpg options for gpg
GPG_KEY="$(config yadm.gpg-recipient)" GPG_KEY="$(config yadm.gpg-recipient)"
if [ "$GPG_KEY" = "ASK" ]; then if [ "$GPG_KEY" = "ASK" ]; then
GPG_OPTS=("--no-default-recipient" "-e") GPG_OPTS=("--no-default-recipient" "-e")
@ -1178,7 +1178,6 @@ yadm.auto-alt
yadm.auto-exclude yadm.auto-exclude
yadm.auto-perms yadm.auto-perms
yadm.auto-private-dirs yadm.auto-private-dirs
yadm.cygwin-copy
yadm.cipher yadm.cipher
yadm.git-program yadm.git-program
yadm.gpg-perms yadm.gpg-perms
@ -1992,7 +1991,7 @@ function require_openssl() {
OPENSSL_PROGRAM="$alt_openssl" OPENSSL_PROGRAM="$alt_openssl"
more_info="\nThis command has been set via the yadm.openssl-program configuration." more_info="\nThis command has been set via the yadm.openssl-program configuration."
fi fi
command -v "$OPENSSL_PROGRAM" >/dev/null 2>&1 || \ command -v "$OPENSSL_PROGRAM" &> /dev/null ||
error_out "This functionality requires OpenSSL to be installed, but the command '$OPENSSL_PROGRAM' cannot be located.$more_info" error_out "This functionality requires OpenSSL to be installed, but the command '$OPENSSL_PROGRAM' cannot be located.$more_info"
} }
function require_repo() { function require_repo() {