Merge branch 'master' of https://github.com/RasppleII/a2server into refactor

install.sh

@@ -11,7 +11,17 @@
 a2serverVersion="1.9.0"
 a2sScriptURL="https://raw.githubusercontent.com/RasppleII/a2server/master"
 
-# Run the legacy setup script for anything not yet ported
-if [ -e setup/index.txt ]; then
-	source setup/index.txt "$@"
+a2sDevel="$( dirname "${BASH_SOURCE[0]}" )"
+if [[ -f "$a2sDevel/.a2server_source" ]]; then
+	pushd $a2sDevel >/dev/null
+	a2sDevel="$PWD"
+	popd >/dev/null
+else
+	printf "a2server: Cannot find a2server source tree relative to ${BASH_SOURCE[0]}\n\n"
+	exit 1
+fi
+
+# Run the legacy setup script for anything not yet ported
+if [[ -e "${a2sDevel}/setup/index.txt" ]]; then
+	source "${a2sDevel}/setup/index.txt" "$@"
 fi

setup/index.txt

@@ -169,6 +169,7 @@ doSetup=1
 
 if a2sCmpInstalled lt 1.5.2; then
 	a2server_update=1
+fi
 
 unsupportedOS=1
 if [[ $isRpi ]]; then #supported Raspbian? (16-Feb-15, 20-Jun-14, 09-Jan-14, etc)
@@ -189,8 +190,8 @@ fi
 
 if [[ $unsupportedOS && $isRpi ]]; then
 	echo
-	echo "A2SERVER and its installer scripts have been tested on Raspbian Wheezy and"
-	echo "Jessie, though not this specific firmware version"
+	echo "A2SERVER and its installer scripts have been tested on Raspbian Wheezy,"
+	echo "Jessie, and Stretch though not this specific firmware version"
 	echo "(${fwhash:0:7}). Just FYI."
 	unsupportedOS=
 elif [[ $unsupportedOS && $isDebian ]]; then
@@ -269,7 +270,6 @@ if (( $doSetup )); then
 			fi
 		done
 
-
 		echo
 		echo "During this installation, enter ${password} if prompted for passwords."
 		echo