From ed0de24e6bc2cac4c20051070710557055b463d0 Mon Sep 17 00:00:00 2001
From: David Walter Seikel
Date: Sun, 27 Nov 2016 23:58:40 +1000
Subject: Various little backup system fixes.

---
 scripts/start-sim | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

(limited to 'scripts/start-sim')

diff --git a/scripts/start-sim b/scripts/start-sim
index 72bb9ba..6c87e09 100755
--- a/scripts/start-sim
+++ b/scripts/start-sim
@@ -101,7 +101,8 @@ case $(basename $0) in
 	;;
 
     "backup-inventory")
-	user=$($SUDO ${PRGDIR}/gitAR.sh i "${inventory}")
+	$SUDO ${PRGDIR}/gitAR.sh i "${inventory}"
+	user=$(sanitize "${inventory}")
 	# Add the full date and time to create the IAR file name.
 	cmd="save iar -c ${inventory} / password ${PRGDIR}/../../backups/${user}-${date}.iar"
 	# Do it in the highest numbered window.
@@ -110,13 +111,13 @@ case $(basename $0) in
 	;;
 
     "backup-sim")
-	sim=$($SUDO ${PRGDIR}/gitAR.sh o "${title}")
+	$SUDO ${PRGDIR}/gitAR.sh o "${title}"
+	sim=$(sanitize "${title}")
 	# Add the full date and time to create the OAR file name.
 	cmd="save oar --all ${PRGDIR}/../../backups/${sim}-${date}.oar"
 	if [ -e /var/run/opensim/${tgt}.pid ]; then
 	    ${tmux_send}:"[${title}]" "${cmd}" Enter
-	    # Wait a bit, then generate the map tiles, coz the good generator leaks memory badly if you leave it turned on.
-	    sleep 30
+	    # Generate the map tiles, coz the good generator leaks memory badly if you leave it turned on.
 	    ${tmux_send}:"[${title}]" "generate map" Enter
 	    ${tmux_send}:"[${title}]" "force gc" Enter
 	else
-- 
cgit v1.1