From dbff9cb5ec4b84a75b3eef1569c0da9c2175784e Mon Sep 17 00:00:00 2001
From: onefang
Date: Thu, 1 Aug 2019 05:54:22 +1000
Subject: ROBUST does support includes, so use them.

---
 scripts/install/secure.sh |  1 -
 scripts/robust-include    | 11 -----------
 scripts/start-sim         |  4 ----
 3 files changed, 16 deletions(-)
 delete mode 100755 scripts/robust-include

(limited to 'scripts')

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}
 sudo chmod -R a+x ${OS_PATH}/current/*.sh
 sudo chmod -R a+x ${OS_PATH}/current/scripts/*.sh
 sudo chmod -R a+x ${OS_PATH}/current/scripts/install/*.sh
-sudo chmod a+x ${OS_PATH}/current/scripts/robust-include
 sudo chmod a+x ${OS_PATH}/current/scripts/show-console
 sudo chmod a+x ${OS_PATH}/current/scripts/start-sim
 
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 @@
-#!/bin/bash
-
-# Silly script to get around the lack of includes in ROBUST.
-
-source common.sh
-getPrgDir
-
-# The problem here is that the > bit is executed as the user, not as opensim.
-cat ${PRGDIR}/../../config/config.ini ${PRGDIR}/../bin/Robust.ini >${PRGDIR}/../../config/Robust.ini
-chown -R ${OS_USER}:${OS_USER} ${PRGDIR}/../../config/Robust.ini
-chmod 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
 	if [ ! -e ${PRGDIR}/../../caches/${tgt}.pid ]
 	then
 	    if [ "x$tgt" = "xROBUST" ]; then
-		pushd ${PRGDIR}/../scripts
-		$SUDO ./robust-include
-		popd
-		cmd="${cmd} -inifile=${PRGDIR}/../../config/Robust.ini"
 		${tmux_command} split-window -hp 50 -t "${tmux_session}:" "${cmd}"
 	    else
 		${tmux_command} new-window -dn "${title}" -t "${tmux_session}:${num}" "${cmd}"
-- 
cgit v1.1