diff options
author | Jonas Smedegaard <dr@jones.dk> | 2004-04-15 23:06:44 +0000 |
---|---|---|
committer | Jonas Smedegaard <dr@jones.dk> | 2004-04-15 23:06:44 +0000 |
commit | 453014af6fb5d935cc34e26a32293d46093646c0 (patch) | |
tree | 9225a23be663e29549b2b326a9f57f2fae0227c2 /localuserconfig | |
parent | f60dba9c0bb21a20259955d607f79ad820f73304 (diff) |
Fix default username not confusing check for config file existence.
Diffstat (limited to 'localuserconfig')
-rwxr-xr-x | localuserconfig | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/localuserconfig b/localuserconfig index 18830f1..e84cdf3 100755 --- a/localuserconfig +++ b/localuserconfig @@ -3,7 +3,7 @@ # /usr/local/bin/localuserconfig # Copyright 2004 Jonas Smedegaard <dr@jones.dk> # -# $Id: localuserconfig,v 1.4 2004-04-15 23:01:49 jonas Exp $ +# $Id: localuserconfig,v 1.5 2004-04-15 23:06:44 jonas Exp $ # # Set/change local account settings # @@ -97,7 +97,6 @@ fi if [ "$do_server" = "yes" ]; then server_edit="1" - server_username=$user if [ -r "$HOME/$server_userconf" ]; then server_username="$(grep '^username' $HOME/$server_userconf | awk -F= '{print $2}' | head -1 | awk '{print $1}')" server_password="$(grep '^password' $HOME/$server_userconf | awk -F= '{print $2}' | head -1 | awk '{print $1}')" @@ -111,6 +110,8 @@ if [ "$do_server" = "yes" ]; then server_edit="1" ;; esac + else + server_username=$user fi if [ "$server_edit" = "1" ]; then if [ -n "$server_username" ]; then |