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

fixed detection of installed comm software; minor text changes

Browse Source
This commit is contained in:
Ivan X 2016-01-17 10:06:01 -05:00
parent b7528026de
commit fbc1ce5ba2
1 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
scripts/a2server-5-netboot.txt
View File

@ -93,7 +93,7 @@ updateP8YearTables () {
# Update ProDOS 8 year table (and spalsh date because may as well) # Update ProDOS 8 year table (and spalsh date because may as well)
# Effectively, we're turning p8 into the 6.0.2 or 6.0.3 version here. # Effectively, we're turning p8 into the 6.0.2 or 6.0.3 version here.
# #
# ID: updates the year tables for the Thunderclock driver in ProDOS 8; # ID: updates the year table for the Thunderclock driver in ProDOS 8;
# calculated from the day of week and date, as year is unavailable. # calculated from the day of week and date, as year is unavailable.
# accepts optional arguments for custom patches # accepts optional arguments for custom patches
# arg1 = year table, comma separated # arg1 = year table, comma separated
@ -500,7 +500,7 @@ if [[ ! $autoAnswerYes || -f /tmp/a2server-setupNetBoot ]]; then
# if [[ ! $autoAnswerYes && (! $gsosInstall || $gsosInstall -lt 2) ]] && ! checkP8YearTables 603; then # if [[ ! $autoAnswerYes && (! $gsosInstall || $gsosInstall -lt 2) ]] && ! checkP8YearTables 603; then
# echo # echo
# echo -n "Do you want to update the ProDOS 8 Thunderclock year tables? " # echo -n "Do you want to update the ProDOS 8 Thunderclock year table? "
# read # read
# fi # fi
# if [[ $autoAnswerYes || ${REPLY:0:1} == "Y" || ${REPLY:0:1} == "y" ]]; then # if [[ $autoAnswerYes || ${REPLY:0:1} == "Y" || ${REPLY:0:1} == "y" ]]; then
@ -511,7 +511,7 @@ if [[ ! $autoAnswerYes || -f /tmp/a2server-setupNetBoot ]]; then
# patch ProDOS 8 Thunderclock driver year table based on today's date # patch ProDOS 8 Thunderclock driver year table based on today's date
echo echo
echo "A2SERVER: Updating ProDOS 8 Thunderclock driver year tables..." echo "A2SERVER: Updating ProDOS 8 Thunderclock driver year table..."
mkdir -p /tmp/netboot mkdir -p /tmp/netboot
rm -r /tmp/netboot/* 2> /dev/null rm -r /tmp/netboot/* 2> /dev/null
wget -qO /tmp/netboot/clock.patch.py "${scriptURL}scripts/clock.patch.py" wget -qO /tmp/netboot/clock.patch.py "${scriptURL}scripts/clock.patch.py"
@ -694,7 +694,7 @@ if [[ ! $autoAnswerYes || -f /tmp/a2server-setupNetBoot ]]; then
p8CommInstalled= p8CommInstalled=
[[ -f $commDir/ProTERM/PROTERM && -f $commDir/Z.Link/Z.LINK && -f $commDir/ADTPro/ADTPRO && -f $commDir/ADTPro/VSDRIVE ]] && p8CommInstalled=1 [[ -f $commDir/ProTERM/PROTERM && -f $commDir/Z.Link/Z.LINK && -f $commDir/ADTPro/ADTPRO && -f $commDir/ADTPro/VSDRIVE ]] && p8CommInstalled=1
gsosCommInstalled= gsosCommInstalled=
[[ -f $commDir/Spectrum/Spectrum && -f $commDir/SAM2/SAM2 && -f $commDir/SAFE2/SAFE2 && $commDir/SNAP/SNAP && $gsosDir/System/CDevs/TCPIP ]] && gsosCommInstalled=1 [[ -f $commDir/Spectrum/Spectrum && -f $commDir/SAM2/SAM2 && -f $commDir/SAFE2/SAFE2 && -f $commDir/SNAP/SNAP && -f $gsosDir/System/CDevs/TCPIP ]] && gsosCommInstalled=1
commInstalled= commInstalled=
if [[ $gsosInstalled ]]; then if [[ $gsosInstalled ]]; then
[[ $gsosCommInstalled && $p8CommInstalled ]] && commInstalled=1 [[ $gsosCommInstalled && $p8CommInstalled ]] && commInstalled=1
@ -809,7 +809,7 @@ if [[ ! $autoAnswerYes || -f /tmp/a2server-setupNetBoot ]]; then
if [[ $? != 0 || ! -f PPPX.1.3d4.SHK || $(wc -c < PPPX.1.3d4.SHK) != "22068" ]]; then if [[ $? != 0 || ! -f PPPX.1.3d4.SHK || $(wc -c < PPPX.1.3d4.SHK) != "22068" ]]; then
wget -qO PPPX.1.3d4.SHK ${binaryURL}external/appleii/PPPX.1.3d4.SHK wget -qO PPPX.1.3d4.SHK ${binaryURL}external/appleii/PPPX.1.3d4.SHK
fi fi
cppo -ad -s PPPX.1.3d4.SHK . &> /dev/null cppo -ad -s PPPX.1.3d4.SHK . > /dev/null
cd PPPX.1.3d4 cd PPPX.1.3d4
cpAD PPP.scripted $gsosDir/System/TCPIP cpAD PPP.scripted $gsosDir/System/TCPIP
cpAD PPP.Script.DOC $commDir/Marinetti/Documentation cpAD PPP.Script.DOC $commDir/Marinetti/Documentation