opensim-tools – Diff between revs 45 and 46

Subversion Repositories:
Rev:
Show entire file – Ignore whitespace
Rev 45 Rev 46
Line 21... Line 21...
21 rm $TMP 2>/dev/null 21 rm $TMP 2>/dev/null
22 # Set Vivox 22 # Set Vivox
23 dialog --yesno "The Spectacled Owl can be configured to support voice via Vivox (http://support.vivox.com/opensim/). If you wish to configure voice, you need to visit the Vivox website and request a username and a password. if you have received the settings from Vivox, would you like to configure voice now?" 10 70 23 dialog --yesno "The Spectacled Owl can be configured to support voice via Vivox (http://support.vivox.com/opensim/). If you wish to configure voice, you need to visit the Vivox website and request a username and a password. if you have received the settings from Vivox, would you like to configure voice now?" 10 70
24 if [ $? == "0" ]; then 24 if [ $? == "0" ]; then
25 USERNAME=`cat OpenSim.ini | grep vivox_admin_user | awk -F"[ \t]*[=][ \t]*" '{ print $2 }'` 25 USERNAME=`cat OpenSim.ini | grep vivox_admin_user | awk -F"[ \t]*[=][ \t]*" '{ print $2 }'`
-   26 if [ ! -z $USERNAME ]; then
26 TMP=`date +%s | sha1sum | awk '{ print $1 }'` 27 TMP=`date +%s | sha1sum | awk '{ print $1 }'`
27 dialog --inputbox "Please enter your Vivox admin user: " 10 70 $USER 2> $TMP 28 dialog --inputbox "Please enter your Vivox admin user: " 10 70 $USER 2> $TMP
28 if [ $? == "0" ]; then 29 if [ $? == "0" ]; then
29 USERNAME=`cat $TMP` 30 USERNAME=`cat $TMP`
30 sed -i "s/vivox_admin_user *=.*/vivox_admin_user = $USERNAME/g" \ 31 sed -i "s/vivox_admin_user *=.*/vivox_admin_user = $USERNAME/g" \
31 OpenSim.ini; 32 OpenSim.ini;
-   33 fi
-   34 rm $TMP 2>/dev/null
32 fi 35 fi
33 rm $TMP 2>/dev/null -  
34 PASSWORD=`cat OpenSim.ini | grep vivox_admin_password | awk -F"[ \t]*[=][ \t]*" '{ print $2 }'` 36 PASSWORD=`cat OpenSim.ini | grep vivox_admin_password | awk -F"[ \t]*[=][ \t]*" '{ print $2 }'`
-   37 if [ ! -z $PASSWORD ]; then
35 TMP=`date +%s | sha1sum | awk '{ print $1 }'` 38 TMP=`date +%s | sha1sum | awk '{ print $1 }'`
36 dialog --inputbox "Please enter your Vivox admin passsword: " 10 70 $PASS 2> $TMP 39 dialog --inputbox "Please enter your Vivox admin passsword: " 10 70 $PASS 2> $TMP
37 if [ $? == "0" ]; then 40 if [ $? == "0" ]; then
38 PASSWORD=`cat $TMP` 41 PASSWORD=`cat $TMP`
39 sed -i "s/vivox_admin_password *=.*/vivox_admin_password = $PASSWORD/g" \ 42 sed -i "s/vivox_admin_password *=.*/vivox_admin_password = $PASSWORD/g" \
40 OpenSim.ini; 43 OpenSim.ini;
-   44 fi
-   45 rm $TMP 2>/dev/null
41 fi 46 fi
42 rm $TMP 2>/dev/null -  
43 fi 47 fi
44 rm $TMP 2>/dev/null 48 rm $TMP 2>/dev/null
45 popd 49 popd