Attachment 682 Details for Bug 894 – use && rather than test -a

[patch] use && rather than test -a

openssh-xsi.patch (text/plain), 1.40 KB, created by Colin Watson on 2004-07-10 22:46:31 AEST

(hide)

Description:

Filename:

MIME Type:

Creator: Colin Watson

Created: 2004-07-10 22:46:31 AEST

Size: 1.40 KB

patch

obsolete

>Index: Makefile.in
>===================================================================
>RCS file: /cvs/openssh/Makefile.in,v
>retrieving revision 1.261
>diff -p -u -r1.261 Makefile.in
>--- Makefile.in	23 Jun 2004 03:21:54 -0000	1.261
>+++ Makefile.in	10 Jul 2004 12:46:57 -0000
>@@ -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
> 
>Index: contrib/ssh-copy-id
>===================================================================
>RCS file: /cvs/openssh/contrib/ssh-copy-id,v
>retrieving revision 1.4
>diff -p -u -r1.4 ssh-copy-id
>--- contrib/ssh-copy-id	4 Jan 2004 21:16:34 -0000	1.4
>+++ contrib/ssh-copy-id	10 Jul 2004 12:46:57 -0000
>@@ -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
>

Actions: View | Diff

Attachments on bug 894: 682