diff options
| author | Nico Dietrich | 2006-04-04 21:46:30 +0200 |
|---|---|---|
| committer | Nico Dietrich | 2006-04-04 21:46:30 +0200 |
| commit | 68cf960258afd0d426236c0d2501f3a8695b0b01 (patch) | |
| tree | f82bdd0479fde2b40cf5f470a1cc3012c3a0e36c /installer | |
| parent | fix for last commit (diff) | |
| download | core-68cf960258afd0d426236c0d2501f3a8695b0b01.tar.gz core-68cf960258afd0d426236c0d2501f3a8695b0b01.tar.xz core-68cf960258afd0d426236c0d2501f3a8695b0b01.zip | |
only diff if old file exists
git-svn-id: http://svn.openslx.org/svn/openslx/ld4@156 95ad53e4-c205-0410-b2fa-d234c58c8868
Diffstat (limited to 'installer')
| -rwxr-xr-x | installer/ld4-inst | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/installer/ld4-inst b/installer/ld4-inst index a686c036..93bfcaff 100755 --- a/installer/ld4-inst +++ b/installer/ld4-inst @@ -317,7 +317,7 @@ setup_server () { done # copy the client configuration default file and replace root_pw - machine-setup - sed -e "s,@@@root_pw@@@,${root_pw}," \ + sed -e "s,@@@root_pw@@@,'${root_pw}'," \ default_files/machine-setup.default > ${dxs_conf}/${dxs_client_conf}-${timestamp} # creating new configuration files in $dxs_conf @@ -376,7 +376,7 @@ setup_server () { # check if file changed lastfile=`ls -lt ${dxs_conf}/${1}* | awk '{print $8}'| sed -n "2,2p"` - diff ${dxs_conf}/${1}-${timestamp} ${lastfile} >/dev/null + ! [ -z $lastfile ] && diff ${dxs_conf}/${1}-${timestamp} ${lastfile} >/dev/null if [ $? -eq 0 ] ; then echo "Configuration file ${2} didn't change - leaving unchanged" rm ${dxs_conf}/${1}-${timestamp} |