aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/scripts
diff options
context:
space:
mode:
authoronefang2019-08-01 05:54:22 +1000
committeronefang2019-08-01 05:54:22 +1000
commitdbff9cb5ec4b84a75b3eef1569c0da9c2175784e (patch)
treedcdcfe36060b63cd96ddfad6d2e76f40d525355c /scripts
parentAutomatically add members to certain groups, and HGers from specific grids to... (diff)
downloadopensim-SC_OLD-dbff9cb5ec4b84a75b3eef1569c0da9c2175784e.zip
opensim-SC_OLD-dbff9cb5ec4b84a75b3eef1569c0da9c2175784e.tar.gz
opensim-SC_OLD-dbff9cb5ec4b84a75b3eef1569c0da9c2175784e.tar.bz2
opensim-SC_OLD-dbff9cb5ec4b84a75b3eef1569c0da9c2175784e.tar.xz
ROBUST does support includes, so use them.
Diffstat (limited to 'scripts')
-rwxr-xr-xscripts/install/secure.sh1
-rwxr-xr-xscripts/robust-include11
-rwxr-xr-xscripts/start-sim4
3 files changed, 0 insertions, 16 deletions
diff --git a/scripts/install/secure.sh b/scripts/install/secure.sh
index db73558..43ed679 100755
--- a/scripts/install/secure.sh
+++ b/scripts/install/secure.sh
@@ -12,7 +12,6 @@ sudo chmod -R g+w ${OS_PATH}
12sudo chmod -R a+x ${OS_PATH}/current/*.sh 12sudo chmod -R a+x ${OS_PATH}/current/*.sh
13sudo chmod -R a+x ${OS_PATH}/current/scripts/*.sh 13sudo chmod -R a+x ${OS_PATH}/current/scripts/*.sh
14sudo chmod -R a+x ${OS_PATH}/current/scripts/install/*.sh 14sudo chmod -R a+x ${OS_PATH}/current/scripts/install/*.sh
15sudo chmod a+x ${OS_PATH}/current/scripts/robust-include
16sudo chmod a+x ${OS_PATH}/current/scripts/show-console 15sudo chmod a+x ${OS_PATH}/current/scripts/show-console
17sudo chmod a+x ${OS_PATH}/current/scripts/start-sim 16sudo chmod a+x ${OS_PATH}/current/scripts/start-sim
18 17
diff --git a/scripts/robust-include b/scripts/robust-include
deleted file mode 100755
index e427eb1..0000000
--- a/scripts/robust-include
+++ /dev/null
@@ -1,11 +0,0 @@
1#!/bin/bash
2
3# Silly script to get around the lack of includes in ROBUST.
4
5source common.sh
6getPrgDir
7
8# The problem here is that the > bit is executed as the user, not as opensim.
9cat ${PRGDIR}/../../config/config.ini ${PRGDIR}/../bin/Robust.ini >${PRGDIR}/../../config/Robust.ini
10chown -R ${OS_USER}:${OS_USER} ${PRGDIR}/../../config/Robust.ini
11chmod 600 ${PRGDIR}/../../config/Robust.ini
diff --git a/scripts/start-sim b/scripts/start-sim
index 774aa54..3966ac8 100755
--- a/scripts/start-sim
+++ b/scripts/start-sim
@@ -92,10 +92,6 @@ case $(basename $0) in
92 if [ ! -e ${PRGDIR}/../../caches/${tgt}.pid ] 92 if [ ! -e ${PRGDIR}/../../caches/${tgt}.pid ]
93 then 93 then
94 if [ "x$tgt" = "xROBUST" ]; then 94 if [ "x$tgt" = "xROBUST" ]; then
95 pushd ${PRGDIR}/../scripts
96 $SUDO ./robust-include
97 popd
98 cmd="${cmd} -inifile=${PRGDIR}/../../config/Robust.ini"
99 ${tmux_command} split-window -hp 50 -t "${tmux_session}:" "${cmd}" 95 ${tmux_command} split-window -hp 50 -t "${tmux_session}:" "${cmd}"
100 else 96 else
101 ${tmux_command} new-window -dn "${title}" -t "${tmux_session}:${num}" "${cmd}" 97 ${tmux_command} new-window -dn "${title}" -t "${tmux_session}:${num}" "${cmd}"