mirror of
https://github.com/RasppleII/a2server.git
synced 2024-12-22 17:29:34 +00:00
Merge branch 'master' of https://github.com/RasppleII/a2server
This commit is contained in:
commit
f9b120002a
@ -46,7 +46,7 @@ Once you have those:
|
||||
export A2SERVER_NO_EXTERNAL=1
|
||||
~~~
|
||||
|
||||
You may want to put the above exports into ~/.bashrc or ~/.bash_profile.
|
||||
You may want to put the above exports into `~/.bashrc` or `~/.bash_profile`.
|
||||
|
||||
If you want to host scripts locally installed on your own machine or another
|
||||
computer on your LAN, type the following, and export "http://localhost:8000/"
|
||||
|
@ -22,7 +22,7 @@ arch=
|
||||
if [[ -f /usr/bin/raspi-config ]]; then
|
||||
isRpi=1
|
||||
arch='rpi'
|
||||
elif lsb_release -a 2> /dev/null | grep -q 'Distributor ID:.Debian' && [[ $(cut -c 1 <<< $debianVersion) -ge "7" ]]; then
|
||||
elif lsb_release -a 2> /dev/null | grep -q 'Distributor ID:.Debian' && [[ $(cut -d . -f 1 <<< $debianVersion) -ge "7" ]]; then
|
||||
uname_m="$(uname -m)"
|
||||
if [[ $uname_m == "i686" ]]; then
|
||||
arch='debian_x86'
|
||||
@ -33,10 +33,10 @@ fi
|
||||
|
||||
debianName=
|
||||
if [[ $debianVersion ]]; then
|
||||
debianMajor=$(cut -c 1-2 <<< $debianVersion)
|
||||
if [[ $debianMajor == "8." ]]; then
|
||||
debianMajor=$(cut -d . -f 1 <<< $debianVersion)
|
||||
if [[ $debianMajor == "8" ]]; then
|
||||
debianName="jessie"
|
||||
elif [[ $debianMajor == "7." ]]; then
|
||||
elif [[ $debianMajor == "7" ]]; then
|
||||
debianName="wheezy"
|
||||
else
|
||||
debianName="unknown"
|
||||
|
@ -32,7 +32,7 @@ arch=
|
||||
if [[ -f /usr/bin/raspi-config ]]; then
|
||||
isRpi=1
|
||||
arch='rpi'
|
||||
elif lsb_release -a 2> /dev/null | grep -q 'Distributor ID:.Debian' && [[ $(cut -c 1 <<< $debianVersion) -ge "7" ]]; then
|
||||
elif lsb_release -a 2> /dev/null | grep -q 'Distributor ID:.Debian' && [[ $(cut -d . -f 1 <<< $debianVersion) -ge "7" ]]; then
|
||||
uname_m="$(uname -m)"
|
||||
if [[ $uname_m == "i686" ]]; then
|
||||
arch='debian_x86'
|
||||
@ -43,10 +43,10 @@ fi
|
||||
|
||||
debianName=
|
||||
if [[ $debianVersion ]]; then
|
||||
debianMajor=$(cut -c 1-2 <<< $debianVersion)
|
||||
if [[ $debianMajor == "8." ]]; then
|
||||
debianMajor=$(cut -d . -f 1 <<< $debianVersion)
|
||||
if [[ $debianMajor == "8" ]]; then
|
||||
debianName="jessie"
|
||||
elif [[ $debianMajor == "7." ]]; then
|
||||
elif [[ $debianMajor == "7" ]]; then
|
||||
debianName="wheezy"
|
||||
else
|
||||
debianName="unknown"
|
||||
|
@ -340,11 +340,22 @@ if [[ ! $autoAnswerYes || -f /tmp/a2server-setupNetBoot ]]; then
|
||||
|
||||
if [[ $gsosReinstall ]]; then
|
||||
if [[ ! $autoAnswerYes ]]; then
|
||||
echo
|
||||
echo "You can set up GS/OS for network boot. This may take a while."
|
||||
echo
|
||||
echo " 0: don't install GS/OS"
|
||||
echo "1: GS/OS 6.0.1 (official Apple release, May 1993)"
|
||||
echo "2: GS/OS 6.0.2 (community release by Antoine Vignau, July 2015)"
|
||||
echo "3: GS/OS 6.0.3 (community release by Tony Diaz, August 2015)"
|
||||
echo " 1: GS/OS 6.0.1 (May 1993) [official release]"
|
||||
echo " The final version authorized by Apple. It has a few bugs,"
|
||||
echo " but most of these can be patched. Predictable and might be"
|
||||
echo " required if you use certain patches."
|
||||
echo " 2: GS/OS 6.0.2 (Jul 2015)"
|
||||
echo " A community effort released by Antoine Vignau with fixes for"
|
||||
echo " some serious bugs and a few other enhancements."
|
||||
echo " 3: GS/OS 6.0.3 (Aug 2015)"
|
||||
echo " Continuing community effort released by Tony Diaz. Includes"
|
||||
echo " previous work along with additional fixes/changes. Better"
|
||||
echo " documentation of changes. Most will prefer this or Apple's"
|
||||
echo " release above."
|
||||
echo
|
||||
echo -n "Which flavor would you like? "
|
||||
read
|
||||
|
@ -14,7 +14,7 @@ password="your password"
|
||||
[[ $isRaspberryPw ]] && password="'raspberry'"
|
||||
|
||||
isDebian=
|
||||
[[ ( -f /etc/debian_version ) && ( $(cut -c 1-2 < /etc/debian_version) == "7." ) && ( $(uname -m) == "i686" ) ]] && isDebian=1
|
||||
b_release -a 2> /dev/null | grep -q 'Distributor ID:.Debian' && [[ ( -f /etc/debian_version ) && ( $(cut -d . -f 1 < /etc/debian_version) -ge "7" ) ]] && isDebian=1
|
||||
|
||||
if [[ $isDebian ]]; then
|
||||
if { lspci 2> /dev/null | grep -q VirtualBox; }; then
|
||||
|
@ -27,12 +27,13 @@ isRpi=
|
||||
[[ -f /usr/bin/raspi-config ]] && isRpi=1
|
||||
|
||||
isDebian=
|
||||
lsb_release -a 2> /dev/null | grep -q 'Distributor ID:.Debian' && [[ ( -f /etc/debian_version ) && ( $(cut -c 1 < /etc/debian_version) -ge "7" ) ]] && isDebian=1
|
||||
lsb_release -a 2> /dev/null | grep -q 'Distributor ID:.Debian' && [[ ( -f /etc/debian_version ) && ( $(cut -d . -f 1 < /etc/debian_version) -ge "7" ) ]] && isDebian=1
|
||||
|
||||
if [[ -f /usr/local/etc/A2SERVER-version ]]; then
|
||||
echo "A2SERVER version available: $a2serverVersion"
|
||||
echo "A2SERVER version installed: $(cat /usr/local/etc/A2SERVER-version)"
|
||||
if [ -f /usr/local/etc/A2SERVER-version ]; then
|
||||
installedVersion="$(cat /usr/local/etc/A2SERVER-version)"
|
||||
fi
|
||||
echo "A2SERVER version available: $a2serverVersion"
|
||||
echo "A2SERVER version installed: ${installedVersion:=None}"
|
||||
|
||||
echo
|
||||
[[ $scriptURL != *"ivanx.com"* && $scriptURL != *"rawgit.com/RasppleII/a2server"* ]] && echo "Using script URL: $scriptURL"
|
||||
@ -77,10 +78,7 @@ while [[ $1 ]]; do
|
||||
updateRasppleII=1
|
||||
elif [[ $1 == "-v" ]]; then
|
||||
shift
|
||||
if [[ ! -f /usr/local/etc/A2SERVER-version ]]; then
|
||||
echo "A2SERVER version available: $a2serverVersion"
|
||||
echo "A2SERVER version installed: none"
|
||||
fi
|
||||
# Version was already printed
|
||||
[[ $0 == "-bash" ]] && return 1 || exit 1
|
||||
elif [[ $1 ]]; then
|
||||
echo "options:"
|
||||
|
Loading…
Reference in New Issue
Block a user