Browse code

Merge "Remove rejoin-stack.sh"

Jenkins authored on 2016/03/15 03:55:23
Showing 2 changed files
... ...
@@ -1644,7 +1644,7 @@ function service_check {
1644 1644
     done
1645 1645
 
1646 1646
     if [ -n "$failures" ]; then
1647
-        die $LINENO "More details about the above errors can be found with screen, with ./rejoin-stack.sh"
1647
+        die $LINENO "More details about the above errors can be found with screen"
1648 1648
     fi
1649 1649
 }
1650 1650
 
1651 1651
deleted file mode 100755
... ...
@@ -1,25 +0,0 @@
1
-#! /usr/bin/env bash
2
-
3
-# This script rejoins an existing screen, or re-creates a
4
-# screen session from a previous run of stack.sh.
5
-
6
-TOP_DIR=`dirname $0`
7
-
8
-# Import common functions in case the localrc (loaded via stackrc)
9
-# uses them.
10
-source $TOP_DIR/functions
11
-
12
-source $TOP_DIR/stackrc
13
-
14
-SCREENRC=$TOP_DIR/$SCREEN_NAME-screenrc
15
-# if screenrc exists, run screen
16
-if [[ -e $SCREENRC ]]; then
17
-    if screen -ls | egrep -q "[0-9]+.${SCREEN_NAME}"; then
18
-        echo "Attaching to already started screen session.."
19
-        exec screen -r $SCREEN_NAME
20
-    fi
21
-    exec screen -c $SCREENRC
22
-fi
23
-
24
-echo "Couldn't find $SCREENRC file; have you run stack.sh yet?"
25
-exit 1