From c0ff56729a59dc30589de6af6120d825fbaa8cc3 Mon Sep 17 00:00:00 2001
From: David Walter Seikel
Date: Sun, 27 Nov 2016 23:51:59 +1000
Subject: Break out common script bits into their own file.

---
 scripts/start-sim | 20 +++-----------------
 1 file changed, 3 insertions(+), 17 deletions(-)

(limited to 'scripts/start-sim')

diff --git a/scripts/start-sim b/scripts/start-sim
index ed2b07f..72bb9ba 100755
--- a/scripts/start-sim
+++ b/scripts/start-sim
@@ -1,21 +1,7 @@
 #!/bin/bash
 
-# Figure out where we are, most of this mess is to troll through soft links.
-PRG="$0"
-while [ -h "${PRG}" ] ; do
-  ls=$(ls -ld "${PRG}")
-  link=`expr "${ls}" : '.*-> \(.*\)$'`
-  if expr "${link}" : '.*/.*' > /dev/null; then
-    PRG="${link}"
-  else
-    PRG=$(dirname "${PRG}")/"${link}"
-  fi
-done
-PRGDIR=$(dirname "${PRG}")
-pushd ${PRGDIR} >/dev/null
-PRGDIR=$(pwd)
-popd >/dev/null
-
+source common.sh
+getPrgDir
 
 USER=$(whoami)
 console_name="OpenSim_console"
@@ -78,7 +64,7 @@ if [ "x$tgt" = "xROBUST" ]; then
 elif [ "x$inventory" = "x" ]; then
     exe="OpenSim"
     # Grab the first Section line of the sims .xml file, cut it down to the name.
-    title=$(grep "<Section " ../config/${tgt}/*.xml | head -n 1 | cut -d '"' -f 2 )
+    title=$(getSimName ${num})
 fi
 
 case $(basename $0) in 
-- 
cgit v1.1