Apple-2-SW/a2server
1
0
Fork 0
mirror of https://github.com/RasppleII/a2server.git synced 2024-06-12 22:29:28 +00:00
Code Issues Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
T. Joseph Carter 2018-04-10 21:56:19 -07:00
commit 82183ad909
2 changed files with 16 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
install.sh
View File

@ -11,7 +11,17 @@
a2serverVersion="1.9.0" a2serverVersion="1.9.0"
a2sScriptURL="https://raw.githubusercontent.com/RasppleII/a2server/master" a2sScriptURL="https://raw.githubusercontent.com/RasppleII/a2server/master"
# Run the legacy setup script for anything not yet ported a2sDevel="$( dirname "${BASH_SOURCE[0]}" )"
if [ -e setup/index.txt ]; then if [[ -f "$a2sDevel/.a2server_source" ]]; then
source setup/index.txt "$@" 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 fi

6
setup/index.txt
View File

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