switched away from nautilus to dolphin

[feisty_meow.git] / scripts / security / screened_tunneler.sh

diff --git a/scripts/security/screened_tunneler.sh b/scripts/security/screened_tunneler.sh
old mode 100755 (executable)
new mode 100644 (file)
index 8e855bf..62301cc
--- a/scripts/security/screened_tunneler.sh
+++ b/scripts/security/screened_tunneler.sh
@@ -36,7 +36,7 @@ LAUNCH_IT="$1"; shift
 
 function print_instructions()
 {
-  echo "\
+  echo -e "\
 $(basename $0): This script requires at least three parameters and can\n\
 take up to five.  The parameters are (1) tunnel user at hostname, (2) ssh tunnel\n\
 link command, (3) tunnel screen name, (4) tunnel security key, (5) the launch\n\
@@ -68,7 +68,7 @@ fi
 
 #hmmm: these variables should be configurable from plug-ins someday.
 
-TUNNEL_ALERT_SOUND=$FEISTY_MEOW_DIR/database/sounds/woouoo.wav
+TUNNEL_ALERT_SOUND=$FEISTY_MEOW_APEX/infobase/sounds/woouoo.wav
 if [ ! -z "$1" ]; then
   TUNNEL_ALERT_SOUND=$1
 fi
@@ -111,6 +111,13 @@ if [ $LAUNCHING_TUNNEL -eq 1 ]; then
   # loop does not exit on its own.
 else
   # this version re-launches the script but tells it to start the tunnel.
+  existingScreens="$(screen -ls | grep "$TUNNEL_SCREEN_NAME")"
+  if [ ! -z "$existingScreens" ]; then
+    echo "This script is already running a screen for: $TUNNEL_SCREEN_NAME"
+    echo "Connect to that and zap it first before we try to start a new one,"
+    echo "e.g.: screen -r -S \"$TUNNEL_SCREEN_NAME\""
+    exit 1
+  fi
   screen -L -S "$TUNNEL_SCREEN_NAME" -d -m bash $0 "$TUNNEL_USER_PLUS_HOST" "$TUNNEL_LINK" "$TUNNEL_SCREEN_NAME" "$TUNNEL_SECURITY_KEY" go
 fi