aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorroot <root@localhost>2013-02-23 18:38:54 +0100
committerroot <root@localhost>2013-02-23 18:38:54 +0100
commit367ced925b56345b701f6e1c0be66c4d5474c6c2 (patch)
treed847f89b5d402873c15763f112be7cab0fd70d0f
parent6fb48d0eea204b400f81a894dfd9880f69e639a6 (diff)
downloadgit-remote-gcrypt-367ced925b56345b701f6e1c0be66c4d5474c6c2.zip
git-remote-gcrypt-367ced925b56345b701f6e1c0be66c4d5474c6c2.tar.gz
git-remote-gcrypt-367ced925b56345b701f6e1c0be66c4d5474c6c2.tar.bz2
Simplify PRIVENCRYPT
-rwxr-xr-xgit-remote-gcrypt16
1 files changed, 5 insertions, 11 deletions
diff --git a/git-remote-gcrypt b/git-remote-gcrypt
index cb3dfea..37df237 100755
--- a/git-remote-gcrypt
+++ b/git-remote-gcrypt
@@ -288,16 +288,6 @@ CLEAN_FINAL()
fi
}
-addsignkeyparam()
-{
- if isnull "$Conf_signkey"; then
- "$@"
- else
- "$@" -u "$Conf_signkey"
- fi
-}
-
-
ENCRYPT()
{
gpg --batch --force-mdc --compress-algo none --passphrase-fd 3 -c 3<<EOF
@@ -316,7 +306,11 @@ EOF
# Encrypt to recipients $1
PRIVENCRYPT()
{
- addsignkeyparam gpg --compress-algo none -se $1
+ set -- $1
+ if isnonnull "$Conf_signkey"; then
+ set -- "$@" -u "$Conf_signkey"
+ fi
+ gpg --compress-algo none -se "$@"
}
# $1 is the match for good signature, $2 is the textual signers list