projects
/
feisty_meow.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
proving git release script isn't busted
[feisty_meow.git]
/
scripts
/
opensim
/
maybe_restart_opensim.sh
diff --git
a/scripts/opensim/maybe_restart_opensim.sh
b/scripts/opensim/maybe_restart_opensim.sh
index a6abe6358f296818a03746227d56cbeacc11eebd..f6d5e7a4e11be4001f4bfb4adffcb656365c5676 100644
(file)
--- a/
scripts/opensim/maybe_restart_opensim.sh
+++ b/
scripts/opensim/maybe_restart_opensim.sh
@@
-2,7
+2,10
@@
# this locates the main opensim process if possible. if we cannot find it,
# then the process is restarted.
# this locates the main opensim process if possible. if we cannot find it,
# then the process is restarted.
-source $SHELLDIR/opensim/opensim_utils.sh
+#hmmm: this is really more for osgrid, since opensim has two servers.
+
+source "$FEISTY_MEOW_SCRIPTS/core/launch_feisty_meow.sh"
+source "$FEISTY_MEOW_SCRIPTS/opensim/opensim_utils.sh"
# see if the process is findable.
# (this approach will not work if the process actually freezes up but
# see if the process is findable.
# (this approach will not work if the process actually freezes up but
@@
-12,7
+15,7
@@
find_opensim_process OpenSim.exe
if [ -z "$OS_PROC_ID" ]; then
# jump into the opensim binaries directory so we can run stuff.
pushd $HOME/opensim/bin &>/dev/null
if [ -z "$OS_PROC_ID" ]; then
# jump into the opensim binaries directory so we can run stuff.
pushd $HOME/opensim/bin &>/dev/null
- launch_screen
OpenS
im OpenSim.exe
+ launch_screen
opens
im OpenSim.exe
echo "$(date): Restarted opensim instance on $(hostname)."
echo
popd &>/dev/null
echo "$(date): Restarted opensim instance on $(hostname)."
echo
popd &>/dev/null