- (dtucker) [Makefile.in contrib/ssh-copy-id] Bug #894: Improve portability

   of shell constructs.  Patch from cjwatson at debian.org.

diff --git a/ChangeLog b/ChangeLog
index 23867229f4e6d3b6399af91e9219f25bcdfc4ef7..8877d8fd416a3d2381f2e8a7deaf492f85cb5803 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -4,6 +4,8 @@
    redhat.com, ok djm@
  - (dtucker) [regress/Makefile] Clean scp-ssh-wrapper.scp too.  Patch from
    vinschen at redhat.com.
+ - (dtucker) [Makefile.in contrib/ssh-copy-id] Bug #894: Improve portability
+   of shell constructs.  Patch from cjwatson at debian.org.
 
 20040829
  - (dtucker) [openbsd-compat/getrrsetbyname.c] Prevent getrrsetbyname from

diff --git a/Makefile.in b/Makefile.in
index 0d53fa7ea122af8a78df6ce0bf9f26d4ff50434f..85049f799350a37b9edb80c133ef945f66230832 100644 (file)
--- a/Makefile.in
+++ b/Makefile.in
@@ -292,7 +292,7 @@ install-files: scard-install
        else \
                echo "$(DESTDIR)$(sysconfdir)/sshd_config already exists, install will not overwrite"; \
        fi
-       @if [ -f ssh_prng_cmds -a ! -z "$(INSTALL_SSH_PRNG_CMDS)" ]; then \
+       @if [ -f ssh_prng_cmds ] && [ ! -z "$(INSTALL_SSH_PRNG_CMDS)" ]; then \
                if [ ! -f $(DESTDIR)$(sysconfdir)/ssh_prng_cmds ] ; then \
                        $(INSTALL) -m 644 ssh_prng_cmds.out $(DESTDIR)$(sysconfdir)/ssh_prng_cmds; \
                else \
@@ -406,7 +406,7 @@ tests:      $(TARGETS)
                $@
 
 regressclean:
-       if [ -f regress/Makefile -a -r regress/Makefile ]; then \
+       if [ -f regress/Makefile ] && [ -r regress/Makefile ]; then \
                (cd regress && $(MAKE) clean) \
        fi
 

diff --git a/contrib/ssh-copy-id b/contrib/ssh-copy-id
index a1c0a9234316ce7e843f0d7237fafbeca3ffc7cb..1555b5d376c6bd115b3ef9c9e646e27144ac7084 100644 (file)
--- a/contrib/ssh-copy-id
+++ b/contrib/ssh-copy-id
@@ -24,7 +24,7 @@ else
   fi
 fi
 
-if [ -z "`eval $GET_ID`" -a -r "${ID_FILE}" ] ; then
+if [ -z "`eval $GET_ID`" ] && [ -r "${ID_FILE}" ] ; then
   GET_ID="cat ${ID_FILE}"
 fi