clockwerk-tools – Diff between revs 32 and 35

Subversion Repositories:
Rev:
Show entire file – Ignore whitespace
Rev 32 Rev 35
Line 54... Line 54...
54 ./runprebuild.sh clean 54 ./runprebuild.sh clean
55 echo "[Clockwerk] Prebuild..." 55 echo "[Clockwerk] Prebuild..."
56 ./runprebuild.sh 56 ./runprebuild.sh
57 echo "[Clockwerk] Build..." 57 echo "[Clockwerk] Build..."
58 nant 58 nant
59 if [ -d /srv/opensim ]; then 59 if [ ! -d /srv/opensim ]; then
60 echo "[Clockwerk] Copying files..." -  
61 mkdir -p /srv/opensim 60 mkdir -p /srv/opensim
62 find bin/ -name \*.ini -o -name \*.config -o -name assets -o -name assetcache -exec rm -rf '{}' \; -  
63 cp -Ra bin/* /srv/opensim/ -  
64 echo "[Clockwerk] Changing ownership..." -  
65 chown -R opensim:opensim /srv/opensim/ -  
66 fi 61 fi
-   62 echo "[Clockwerk] Copying files..."
-   63 mkdir -p /srv/opensim
-   64 find bin/ -name \*.ini -o -name \*.config -o -name assets -o -name assetcache -exec rm -rf '{}' \;
-   65 cp -Ra bin/* /srv/opensim/
-   66 echo "[Clockwerk] Changing ownership..."
-   67 chown -R opensim:opensim /srv/opensim/
67 fi 68 fi
68 if [ -d ../clockwerk-opensim-config/ ]; then 69 if [ -d ../clockwerk-opensim-config/ ]; then
69 cd ../clockwerk-opensim-config/ 70 cd ../clockwerk-opensim-config/
70 svn update 71 svn update
71 dialog --yesno "This option will update OpenSim's configuration files EXCEPT Regions.ini which will not be overwritten. It is useful to synchronize OpenSim's configuration files with new options from the development branch. If you have made changes to OpenSim's ini files, a resonable answer will be no. However, at some point you should make a backup and sync with the development version. Update the configuration files now?" 12 70 72 dialog --yesno "This option will update OpenSim's configuration files EXCEPT Regions.ini which will not be overwritten. It is useful to synchronize OpenSim's configuration files with new options from the development branch. If you have made changes to OpenSim's ini files, a resonable answer will be no. However, at some point you should make a backup and sync with the development version. Update the configuration files now?" 12 70
72 if [ $? == "0" ]; then 73 if [ $? == "0" ]; then
-   74 if [ ! -d /srv/opensim ]; then
-   75 mkdir -p /srv/opensim
-   76 fi
73 echo "[Clockwerk] Updating configuration..." 77 echo "[Clockwerk] Updating configuration..."
74 cp -Ra * /srv/opensim/ 78 cp -Ra * /srv/opensim/
75 echo "[Clockwerk] Changing ownership..." 79 echo "[Clockwerk] Changing ownership..."
76 chown -R opensim:opensim /srv/opensim/ 80 chown -R opensim:opensim /srv/opensim/
77 mysql -u debian-sys-maint -pvu9VYfFIcb0qcRVC -D opensim -e "delete from assets where id='00000000-0000-1111-9999-000000000010'" 81 mysql -u debian-sys-maint -pvu9VYfFIcb0qcRVC -D opensim -e "delete from assets where id='00000000-0000-1111-9999-000000000010'"