diff options
Diffstat (limited to 'checks')
| -rw-r--r-- | checks/ChangeLog | 15 | ||||
| -rw-r--r-- | checks/Makefile.am | 16 | ||||
| -rwxr-xr-x | checks/defs.inc | 3 | ||||
| -rwxr-xr-x | checks/mkdemodirs | 12 |
4 files changed, 28 insertions, 18 deletions
diff --git a/checks/ChangeLog b/checks/ChangeLog index 8e043bf71..0af642df2 100644 --- a/checks/ChangeLog +++ b/checks/ChangeLog @@ -1,11 +1,22 @@ -Tue Aug 31 17:20:44 CEST 1999 Werner Koch <[email protected]> +Thu Feb 10 17:39:44 CET 2000 Werner Koch <[email protected]> + + * mkdemodirs: Fixed the --clean loop. + +Thu Jan 13 19:31:58 CET 2000 Werner Koch <[email protected]> + + * defs.inc (chdir): Removed becuase it is unsused an plain old sh + does not like this name. Reported by Alec Habig. +Tue Oct 26 20:02:23 1999 Werner Koch ([email protected]) + + * Makefile.am (GPG_DEARMOR): New and use --no-options. + +Tue Aug 31 17:20:44 CEST 1999 Werner Koch <[email protected]> * defs.inc: set LC_ALL empty Wed Aug 4 10:34:18 CEST 1999 Werner Koch <[email protected]> - * defs.inc (echo_n): New and used instead of /bin/echo "\c" Sun Apr 18 10:11:28 CEST 1999 Werner Koch <[email protected]> diff --git a/checks/Makefile.am b/checks/Makefile.am index bda0a2d90..41ded3cd6 100644 --- a/checks/Makefile.am +++ b/checks/Makefile.am @@ -1,5 +1,7 @@ ## Process this file with automake to create Makefile.in +GPG_DEARMOR = ../g10/gpg --no-options --quiet --yes --dearmor + TESTS = version.test mds.test \ decrypt.test decrypt-dsa.test \ sigs.test sigs-dsa.test \ @@ -37,25 +39,25 @@ prepared.stamp: ./pubring.gpg ./secring.gpg ./plain-1 ./plain-2 ./plain-3 \ ./pubring.gpg: $(srcdir)/pubring.asc - ../g10/gpg --yes --dearmor -o ./pubring.gpg $(srcdir)/pubring.asc + $(GPG_DEARMOR) -o ./pubring.gpg $(srcdir)/pubring.asc ./secring.gpg: $(srcdir)/secring.asc - ../g10/gpg --yes --dearmor -o ./secring.gpg $(srcdir)/secring.asc + $(GPG_DEARMOR) -o ./secring.gpg $(srcdir)/secring.asc ./pubring.pkr: $(srcdir)/pubring.pkr.asc - ../g10/gpg --yes --dearmor -o ./pubring.pkr $(srcdir)/pubring.pkr.asc + $(GPG_DEARMOR) -o ./pubring.pkr $(srcdir)/pubring.pkr.asc ./secring.skr: $(srcdir)/secring.skr.asc - ../g10/gpg --yes --dearmor -o ./secring.skr $(srcdir)/secring.skr.asc + $(GPG_DEARMOR) -o ./secring.skr $(srcdir)/secring.skr.asc ./plain-1: $(srcdir)/plain-1o.asc - ../g10/gpg --yes --dearmor -o ./plain-1 $(srcdir)/plain-1o.asc + $(GPG_DEARMOR) -o ./plain-1 $(srcdir)/plain-1o.asc ./plain-2: $(srcdir)/plain-2o.asc - ../g10/gpg --yes --dearmor -o ./plain-2 $(srcdir)/plain-2o.asc + $(GPG_DEARMOR) -o ./plain-2 $(srcdir)/plain-2o.asc ./plain-3: $(srcdir)/plain-3o.asc - ../g10/gpg --yes --dearmor -o ./plain-3 $(srcdir)/plain-3o.asc + $(GPG_DEARMOR) -o ./plain-3 $(srcdir)/plain-3o.asc diff --git a/checks/defs.inc b/checks/defs.inc index d5fdc8af7..47c6e4d8f 100755 --- a/checks/defs.inc +++ b/checks/defs.inc @@ -48,9 +48,6 @@ info () { echo "$pgmname:" $* >&2 } -chdir () { - cd $1 || fatal "cannot cd to $1" -} echo_n_init=no echo_n () { diff --git a/checks/mkdemodirs b/checks/mkdemodirs index b0755ab48..f0c7e02ba 100755 --- a/checks/mkdemodirs +++ b/checks/mkdemodirs @@ -8,9 +8,9 @@ NAMES='Alpha Bravo Charlie Delta Echo Foxtrot Golf Hotel India Sierra Tango Uniform Victor Whisky XRay Yankee Zulu' if [ "$1" = "--clean" ]; then - for i in $NAMES; do + (for i in $NAMES; do [ -d $i ] && rm -r $i - done + done) || true exit 0 fi @@ -24,10 +24,10 @@ for name in $NAMES; do /bin/echo " $name\c" [ -d $name ] && rm -r $name mkdir $name - $GPGDEMO --export-secret-key -o - $name | tee $name/Secret.gpg | \ - $GPG --homedir $name --import - $GPGDEMO --export -o - $name | tee $name/Public.gpg | \ - $GPG --homedir $name --import + $GPGDEMO --export-secret-key -o - $name > $name/Secret.gpg + $GPG --homedir $name --import $name/Secret.gpg + $GPGDEMO --export -o - $name > $name/Public.gpg + $GPG --homedir $name --import $name/Public.gpg [ -f $name/pubring.gpg~ ] && rm $name/pubring.gpg~ done echo "." |