diff options
| author | Damien Miller <djm@mindrot.org> | 2008-01-20 05:52:04 +1100 |
|---|---|---|
| committer | Damien Miller <djm@mindrot.org> | 2008-01-20 05:52:04 +1100 |
| commit | e27220eb5b55974278dd364e8485de56a45662ed (patch) | |
| tree | b6194a28269b1550998c751987ded6d791e019e9 | |
| parent | d4827ab50c8cacc7af3bab932b89ac4cfdd1e3c1 (diff) | |
- (djm) Silence noice from expr in ssh-copy-id; patch from
mikel AT mikelward.com
| -rw-r--r-- | ChangeLog | 6 | ||||
| -rw-r--r-- | contrib/ssh-copy-id | 2 |
2 files changed, 6 insertions, 2 deletions
@@ -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. @@ -3519,4 +3523,4 @@ OpenServer 6 and add osr5bigcrypt support so when someone migrates passwords between UnixWare and OpenServer they will still work. OK dtucker@ -$Id: ChangeLog,v 1.4817 2008/01/02 07:08:45 dtucker Exp $ +$Id: ChangeLog,v 1.4818 2008/01/19 18:52:04 djm Exp $ diff --git a/contrib/ssh-copy-id b/contrib/ssh-copy-id index 1555b5d3..acd36d39 100644 --- 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" |