5 files changed, 27 insertions, 37 deletions

diff --git a/scripts/backup-inventories.sh b/scripts/backup-inventories.sh
index e4e7158..f819f79 100755
--- a/scripts/backup-inventories.sh
+++ b/scripts/backup-inventories.sh
@@ -27,5 +27,5 @@ mysql --host="${creds[Data Source]}" "${creds[Database]}" --user="${creds[User I
   ${PRGDIR}/backup-inventory "${user}"
   # Sleep for a while, so that there is plenty of time to do the backup,
   # and we are not keeping the computer very busy if there are lots of users.
-  sleep ${sizeSleep}
+#  sleep ${sizeSleep}
 done
diff --git a/scripts/backup-sims.sh b/scripts/backup-sims.sh
index 06cb780..39ab30a 100755
--- a/scripts/backup-sims.sh
+++ b/scripts/backup-sims.sh
@@ -13,7 +13,7 @@ do
         ./backup-sim
         # Sleep for a while, so that there is plenty of time to do the backup,
         # and we are not keeping the computer very busy if there are lots of sims.
-        sleep ${sizeSleep}
+#       sleep ${sizeSleep}
         popd > /dev/null
     fi
 done
diff --git a/scripts/common.sh b/scripts/common.sh
index 6aeb8b5..75aebb0 100755
--- a/scripts/common.sh
+++ b/scripts/common.sh
@@ -36,7 +36,7 @@ num2name()
 # name=$(sanitize "the name")
 sanitize()
 {
-  echo "$1" | sed -e 's/[\\/:\*\?"<>\|@#$%&\0\x01-\x1F\x27\x40\x60\x7F. ]/_/g' -e 's/^$/NONAME/'
+  echo "$1" | sed -e 's/[\\/:\*\?"<>\|@#$%&\x01-\x1F\x27\x40\x60\x7F. ]/_/g' -e 's/^$/NONAME/'
 }
 
 
diff --git a/scripts/install/opensim-monit.conf b/scripts/install/opensim-monit.conf
deleted file mode 100644
index 409b69e..0000000
--- a/scripts/install/opensim-monit.conf
+++ /dev/null
@@ -1,29 +0,0 @@
-# manage the OpenSim process for Your Sim
-#
-# usage:
-#     monit start your_sim
-#     monit stop your_sim
-#     monit restart your_sim
-#
-# see 'daemon' setting in /etc/monit/monitrc for the cycle length.
-# on ubuntu/debian, this is overridden by the CHECK_INTERVALS var in
-# /etc/default/monit .  the below assumes you've set it to 30 seconds.
-#
-# see ../README for configuration instructions.
-#
-# Hmmmm, seems that monit changing to a user and running bash -l is different from sudo changing to a user and running bash -l.
-#
-check process simSIM_NUMBER with pidfile /OS_PATH/caches/simSIM_NUMBER.pid
-    start program = "/usr/bin/sudo -Hu opensim /bin/bash -lc 'cd /OS_PATH/config/simSIM_NUMBER && /OS_PATH/config/simSIM_NUMBER/start-sim -q'"
-        as uid root and gid root
-    stop program = "/usr/bin/sudo -Hu opensim /bin/bash -lc 'cd /OS_PATH/config/simSIM_NUMBER && /OS_PATH/config/simSIM_NUMBER/stop-sim'" with timeout 600 seconds
-    if cpu usage > 50% for 4 cycles then restart
-    if MEMORY usage > 10% for 4 cycles then restart
-#    if 5 restarts within 5 cycles then timeout
-#    if failed url http://127.0.0.1:9005/jsonSimStats/
-#        and content != '"SimFPS":0.0,' for 4 cycles
-#        then restart
-#    if failed url http://127.0.0.1:9008/jsonSimStats/
-#        and content == '"SimFPS":' for 4 cycles
-#        then restart
-    depends on ROBUST
diff --git a/scripts/install/opensim.tmux.conf b/scripts/install/opensim.tmux.conf
index 84e0c21..1b4da52 100644
--- a/scripts/install/opensim.tmux.conf
+++ b/scripts/install/opensim.tmux.conf
@@ -5,7 +5,7 @@ set-option -g prefix C-a
 unbind-key C-b
 bind-key C-a send-prefix
 
-# r reloads the configuration, handy
+# r reloads the configuration, handy.
 bind r source-file ~/.tmux.conf
 
 bind R clear-history
@@ -16,16 +16,31 @@ unbind '"'
 bind | split-window -h
 bind - split-window -v
 
+# pane border
+set -g pane-border-status top
+#colors for pane borders
+set-window-option -g pane-border-style fg=black,bg=green
+set-window-option -g pane-active-border-style fg=black,bg=red
+set-window-option -g automatic-rename off
+set-window-option -g pane-border-format '[#{pane_index}:#{pane_title}]'
+
+# select-pane -t 1 -T "fancy pane title"
+# Note that running a program in that tab might override it - 1 mc [dvs1@Superbitch]:/media/DATA/home/dvs1
+
 # set-options -g global, -s server, -w window, otherwise a session option.
 #   -a appends a string to the existing option.
 #   -u unsets an option.
 #   -o prevents setting an aption if it is already set.
 #   -q shut up info messages.
 
+# SERVER OPTIONS
+
 # SESSION OPTIONS
 
 set-option -g bell-action any
-set-option -g bell-on-alert on
+##set-option -g bell-on-alert on
+set-option -g visual-activity both
+set-option -g visual-bell both
 
 # Not actually documented what the limit is, but there is one.
 set-option -g history-limit 100000
@@ -46,7 +61,7 @@ set-option -g mouse on
 #set-option -g mouse
 ##set-option -g mouse-utf8 off          # Defaults to on.
 
-set-option -g set-remain-on-exit on
+###set-option -g set-remain-on-exit on
 
 # How to set the title of the terminal window.
 set-option -g set-titles on
@@ -79,11 +94,15 @@ set-option -g status-right "%F #(uptime | cut -d ' ' -f 2-2,10-)"	# %F is ISO da
 
 # Set window notifications
 set-option -g visual-activity on        # Show status message for activity in monitor-activity windows.
-#set-option -g visual-content on                # Show status message for content in monitor-content windows.  Based on a fnmatch(3) string.
+#set-option -g visual-content on        # Show status message for content in monitor-content windows.  Based on a fnmatch(3) string.
 set-option -g visual-silence on         # Show status message for silence in monitor-silence windows.  Based on a set interval.
 
-set-option -gw alternate-screen off     # Don't save the original screen before starting tmux, may also allow use of the terminals original scrollback buffer.
+# WINDOW OPTIONS
+
 set-option -gw clock-mode-style 24      # We are using the uptime clock anyway, so this is pointless.
+##set-option -gw mode-mouse on          # on - mouse does copy mode stuff; copy-mode - mouse can't go into copy mode, but does stuff once in there; off - mouse is unmolested.
+
+set-option -gw monitor-activity on      # Bell on activity.
 
 # Highlight active window
 set-option -gw window-status-current-bg red