opensim-tools – Diff between revs 55 and 58

Subversion Repositories:
Rev:
Show entire fileIgnore whitespace
Rev 55 Rev 58
Line 41... Line 41...
41 fi 41 fi
Line 42... Line 42...
42   42  
43 # OpenSim upgrade 43 # OpenSim upgrade
44 pushd ./ 44 pushd ./
45 if [ -d ../opensim-sources/ ]; then 45 if [ -d ../opensim-sources/ ]; then
-   46 rm -rf ../opensim-sources
-   47 fi
46 cd ../opensim-sources/ 48 cd ../
47 echo "[SpectacledOwl] Updating sources..." 49 echo "[SpectacledOwl] Updating sources..."
48 svn update 50 svn co http://svn.was.fm/opensim opensim-sources
49 dialog --yesno "By selecting yes here, the OpenSim sources will be updated from the development repository, compiled and added to the current OpenSim working directory. Selecting yes here will not affect any modifications you may have done to OpenSim's ini files. Upgrade the OpenSim binaries to the lastest development version?" 10 70 51 dialog --yesno "By selecting yes here, the OpenSim sources will be updated from the development repository, compiled and added to the current OpenSim working directory. Selecting yes here will not affect any modifications you may have done to OpenSim's ini files. Upgrade the OpenSim binaries to the lastest development version?" 10 70
50 if [ $? == "0" ]; then 52 if [ $? == "0" ]; then
51 echo "[SpectacledOwl] Cleaning..." 53 echo "[SpectacledOwl] Cleaning..."
52 PKG_CONFIG_PATH=/opt/mono-4-0/lib/pkgconfig make clean 54 PKG_CONFIG_PATH=/opt/mono-4-0/lib/pkgconfig make clean
53 echo "[SpectacledOwl] Build..." 55 echo "[SpectacledOwl] Build..."
54 PKG_CONFIG_PATH=/opt/mono-4-0/lib/pkgconfig make 56 PKG_CONFIG_PATH=/opt/mono-4-0/lib/pkgconfig make
55 if [ -d /home/opensim/os ]; then 57 if [ -d /home/opensim/os ]; then
56 echo "[SpectacledOwl] Copying files..." 58 echo "[SpectacledOwl] Copying files..."
57 mkdir -p /home/opensim/os 59 mkdir -p /home/opensim/os
58 find bin/ -name \*.ini -exec rm -rf '{}' \; 60 find bin/ -name \*.ini -exec rm -rf '{}' \;
59 find bin/ -name \*.config -exec rm -rf '{}' \; 61 find bin/ -name \*.config -exec rm -rf '{}' \;
60 cp -Ra bin/* /home/opensim/os/ 62 cp -Ra bin/* /home/opensim/os/
61 echo "[SpectacledOwl] Changing ownership..." 63 echo "[SpectacledOwl] Changing ownership..."
62 chown -R opensim:opensim /home/opensim/os/ -  
63 fi 64 chown -R opensim:opensim /home/opensim/os/
64 fi 65 fi
-   66 fi
65 fi 67  
66 if [ -d ../opensim-config/ ]; then 68 if [ -d ../opensim-config/ ]; then
67 cd ../opensim-config/ 69 cd ../opensim-config/
68 svn update 70 svn update
69 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 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