|
...
|
...
|
@@ -90,16 +90,6 @@ source $TOP_DIR/lib/config
|
|
90
|
90
|
# and ``DISTRO``
|
|
91
|
91
|
GetDistro
|
|
92
|
92
|
|
|
93
|
|
-# Warn users who aren't on an explicitly supported distro, but allow them to
|
|
94
|
|
-# override check and attempt installation with ``FORCE=yes ./stack``
|
|
95
|
|
-if [[ ! ${DISTRO} =~ (precise|trusty|7.0|wheezy|sid|testing|jessie|f19|f20|rhel6|rhel7) ]]; then
|
|
96
|
|
- echo "WARNING: this script has not been tested on $DISTRO"
|
|
97
|
|
- if [[ "$FORCE" != "yes" ]]; then
|
|
98
|
|
- die $LINENO "If you wish to run this script anyway run with FORCE=yes"
|
|
99
|
|
- fi
|
|
100
|
|
-fi
|
|
101
|
|
-
|
|
102
|
|
-
|
|
103
|
93
|
# Global Settings
|
|
104
|
94
|
# ---------------
|
|
105
|
95
|
|
|
...
|
...
|
@@ -151,6 +141,15 @@ if [[ ! -r $TOP_DIR/stackrc ]]; then
|
|
151
|
151
|
fi
|
|
152
|
152
|
source $TOP_DIR/stackrc
|
|
153
|
153
|
|
|
|
154
|
+# Warn users who aren't on an explicitly supported distro, but allow them to
|
|
|
155
|
+# override check and attempt installation with ``FORCE=yes ./stack``
|
|
|
156
|
+if [[ ! ${DISTRO} =~ (precise|trusty|7.0|wheezy|sid|testing|jessie|f19|f20|rhel6|rhel7) ]]; then
|
|
|
157
|
+ echo "WARNING: this script has not been tested on $DISTRO"
|
|
|
158
|
+ if [[ "$FORCE" != "yes" ]]; then
|
|
|
159
|
+ die $LINENO "If you wish to run this script anyway run with FORCE=yes"
|
|
|
160
|
+ fi
|
|
|
161
|
+fi
|
|
|
162
|
+
|
|
154
|
163
|
# Check to see if we are already running DevStack
|
|
155
|
164
|
# Note that this may fail if USE_SCREEN=False
|
|
156
|
165
|
if type -p screen > /dev/null && screen -ls | egrep -q "[0-9]\.$SCREEN_NAME"; then
|