* lib/gnupload (GPG): Use an absolute path. Suggestion from Gary

V. Vaughan.
(passphrase): Unset it this variable before using it, in case it
was exported.  Report from Scott James Remnant.

diff --git a/ChangeLog b/ChangeLog
index d4518432ce2fa33c87d12f6fb836ac9d0bc77a8b..d5355a46f826ad27c7cb0cc5f94b9e42f6677c80 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2004-01-28  Alexandre Duret-Lutz  <adl@gnu.org>
+
+       * lib/gnupload (GPG): Use an absolute path.  Suggestion from Gary
+       V. Vaughan.
+       (passphrase): Unset it this variable before using it, in case it
+       was exported.  Report from Scott James Remnant.
+
 2004-01-25  Alexandre Duret-Lutz  <adl@gnu.org>
 
        * lib/gnupload (usage): Fix example.

diff --git a/lib/gnupload b/lib/gnupload
index f5efeb78619c6d69c4082d8302db8f962b447ad1..d0e2f537588b0b12590d9932b98b7bc0fda31582 100755 (executable)
--- a/lib/gnupload
+++ b/lib/gnupload
@@ -1,7 +1,7 @@
 #!/bin/sh
 # Sign files and upload them.
 
-scriptversion=2004-01-25.02
+scriptversion=2004-01-28.17
 
 # Copyright (C) 2004  Free Software Foundation
 #
@@ -24,7 +24,7 @@ scriptversion=2004-01-25.02
 
 set -e
 
-GPG='gpg --batch --no-tty'
+GPG='/usr/bin/gpg --batch --no-tty'
 to=
 
 usage="Usage: $0 [OPTIONS]... FILES...
@@ -108,10 +108,15 @@ do
   fi
 done
 
+# Make sure passphrase is not exported in the environment.
+unset passphrase
+
 # Reset PATH to be sure that echo is a built-in.  We will later use
 # `echo $passphrase' to output the passphrase, so it is important that
 # it is a built-in (third-party programs tend to appear in `ps'
 # listings with their arguments...).
+# Remember this script runs with `set -e', so if echo is not built-in
+# it will exit now.
 PATH=/empty echo -n "Enter GPG passphrase: "
 stty -echo
 read -r passphrase