diff options
| author | Jameson Graef Rollins <jrollins@finestructure.net> | 2009-07-24 16:12:37 -0400 |
|---|---|---|
| committer | Jameson Graef Rollins <jrollins@finestructure.net> | 2009-07-24 16:12:37 -0400 |
| commit | 38e61689a9d3231db93ea47783a3edfedccf7ad3 (patch) | |
| tree | 0e6f9e15ab68a7af38d88bbd428bb2ce587b95c5 /src/share/common | |
| parent | 65dfc0ba7f918b0a2787c1cc918e70fe3f247438 (diff) | |
small bug fix, and readbility improvements
Diffstat (limited to 'src/share/common')
| -rw-r--r-- | src/share/common | 14 |
1 files changed, 9 insertions, 5 deletions
diff --git a/src/share/common b/src/share/common index 27e088a..3f71719 100644 --- a/src/share/common +++ b/src/share/common @@ -899,14 +899,18 @@ update_known_hosts() { # below won't fail upon not finding the file if [ ! -f "$KNOWN_HOSTS" ]; then # make sure to create any files or directories with the appropriate write bits turned off: - newUmask=$(printf "%04o" $(( 0$(umask) | 0022 )) - [ -d $(dirname "$KNOWN_HOSTS") ] || (umask "$newUmask" && mkdir -p -m 0700 $(dirname "$KNOWN_HOSTS") ) || failure "Could not create path to known_hosts file '$KNOWN_HOSTS'" + newUmask=$(printf "%04o" $(( 0$(umask) | 0022 )) ) + [ -d $(dirname "$KNOWN_HOSTS") ] \ + || (umask "$newUmask" && mkdir -p -m 0700 $(dirname "$KNOWN_HOSTS") ) \ + || failure "Could not create path to known_hosts file '$KNOWN_HOSTS'" # make sure to create this file with the appropriate bits turned off: - (umask "$newUmask" && touch "$KNOWN_HOSTS") || failure "Unable to create known_hosts file '$KNOWN_HOSTS'" + (umask "$newUmask" && touch "$KNOWN_HOSTS") \ + || failure "Unable to create known_hosts file '$KNOWN_HOSTS'" fi # check permissions on the known_hosts file path - check_key_file_permissions $(whoami) "$KNOWN_HOSTS" || failure "Bad permissions governing known_hosts file '$KNOWN_HOSTS'" + check_key_file_permissions $(whoami) "$KNOWN_HOSTS" \ + || failure "Bad permissions governing known_hosts file '$KNOWN_HOSTS'" # create a lockfile on known_hosts: lock create "$KNOWN_HOSTS" @@ -914,7 +918,7 @@ update_known_hosts() { trap "lock remove $KNOWN_HOSTS" EXIT # note pre update file checksum - fileCheck="$(file_hash "$KNOWN_HOSTS")" + fileCheck=$(file_hash "$KNOWN_HOSTS") for host ; do # process the host |