- (djm) Silence noice from expr in ssh-copy-id; patch from

   mikel AT mikelward.com

diff --git a/ChangeLog b/ChangeLog
index 6396dde6f3f3b6e758fdbeb124b7a655a8702f5c..c059b882d055360c9407bb3ebcde4a62528b4159 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+20080119
+ - (djm) Silence noice from expr in ssh-copy-id; patch from
+   mikel AT mikelward.com
+
 20080102
  - (dtucker) [configure.ac] Fix message for -fstack-protector-all test.
 

diff --git a/contrib/ssh-copy-id b/contrib/ssh-copy-id
index 1555b5d376c6bd115b3ef9c9e646e27144ac7084..acd36d398721f6fec3668626f7112fc22d6b80e8 100644 (file)
--- a/contrib/ssh-copy-id
+++ b/contrib/ssh-copy-id
@@ -11,7 +11,7 @@ if [ "-i" = "$1" ]; then
   shift
   # check if we have 2 parameters left, if so the first is the new ID file
   if [ -n "$2" ]; then
-    if expr "$1" : ".*\.pub" ; then
+    if expr "$1" : ".*\.pub" > /dev/null ; then
       ID_FILE="$1"
     else
       ID_FILE="$1.pub"