From 3ca8cd7a094ff696286aa203f8fbc9e453cc573e Mon Sep 17 00:00:00 2001
From: dtucker <dtucker>
Date: Mon, 30 Aug 2004 11:33:02 +0000
Subject: [PATCH]  - (dtucker) [Makefile.in contrib/ssh-copy-id] Bug #894:
 Improve portability    of shell constructs.  Patch from cjwatson at
 debian.org.

---
 ChangeLog           | 2 ++
 Makefile.in         | 4 ++--
 contrib/ssh-copy-id | 2 +-
 3 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 23867229..8877d8fd 100644
--- 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 0d53fa7e..85049f79 100644
--- 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 a1c0a923..1555b5d3 100644
--- 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
 
-- 
2.45.1