setup.txt: more style consistency

This commit is contained in:
T. Joseph Carter 2016-04-10 03:26:25 -07:00
parent e65da70236
commit a1a26ae6fb

View File

@ -452,7 +452,7 @@ if [[ $installADTPro ]]; then
if [[ ${REPLY:0:1} == "Y" || ${REPLY:0:1} == "y" ]]; then if [[ ${REPLY:0:1} == "Y" || ${REPLY:0:1} == "y" ]]; then
updateADTPro=1 updateADTPro=1
echo "A2CLOUD: removing old version of ADTPro server..." echo "A2CLOUD: removing old version of ADTPro server..."
sudo pkill -f [A]DTPro sudo pkill -f ADTPro
sudo rm /usr/local/adtpro/disks/ADTPRO*.DSK &>/dev/null sudo rm /usr/local/adtpro/disks/ADTPRO*.DSK &>/dev/null
sudo rm /usr/local/adtpro/disks/ADTPRO*.PO &>/dev/null sudo rm /usr/local/adtpro/disks/ADTPRO*.PO &>/dev/null
sudo rm /usr/local/adtpro/disks/VDRIVE*.DSK &>/dev/null sudo rm /usr/local/adtpro/disks/VDRIVE*.DSK &>/dev/null
@ -476,7 +476,7 @@ if [[ $installADTPro ]]; then
if [[ ! -f /usr/local/adtpro/adtpro.sh || ! -f /usr/local/adtpro/ADTPro.html ]]; then if [[ ! -f /usr/local/adtpro/adtpro.sh || ! -f /usr/local/adtpro/ADTPro.html ]]; then
echo "A2CLOUD: installing ADTPro server..." echo "A2CLOUD: installing ADTPro server..."
sudo pkill -f [A]DTPro sudo pkill -f ADTPro
wget -qO /tmp/a2cloud-install/adtpro.tar.gz downloads.sourceforge.net/project/adtpro/adtpro/ADTPro-$adtProVersion/ADTPro-$adtProVersion.tar.gz wget -qO /tmp/a2cloud-install/adtpro.tar.gz downloads.sourceforge.net/project/adtpro/adtpro/ADTPro-$adtProVersion/ADTPro-$adtProVersion.tar.gz
sudo mkdir -p /usr/local/adtpro sudo mkdir -p /usr/local/adtpro
sudo tar --strip-components=1 -C /usr/local/adtpro -zxf /tmp/a2cloud-install/adtpro.tar.gz sudo tar --strip-components=1 -C /usr/local/adtpro -zxf /tmp/a2cloud-install/adtpro.tar.gz
@ -657,7 +657,7 @@ if [[ $setupSerialPortLogin ]]; then
echo "A2CLOUD: Adding USB port shell login at 4800 bps..." echo "A2CLOUD: Adding USB port shell login at 4800 bps..."
echo -e "\n\n#for USB-to-serial adapter\nT1:23:respawn:/usr/local/sbin/usbgetty -h -L -scanttyUSB 4800 vt100" | sudo tee -a /etc/inittab >/dev/null echo -e "\n\n#for USB-to-serial adapter\nT1:23:respawn:/usr/local/sbin/usbgetty -h -L -scanttyUSB 4800 vt100" | sudo tee -a /etc/inittab >/dev/null
sudo init q sudo init q
sudo pkill -f "[g]etty.*ttyUSB" sudo pkill -f "getty.*ttyUSB"
else else
echo "A2CLOUD: USB port shell login already added." echo "A2CLOUD: USB port shell login already added."
fi fi
@ -1185,7 +1185,7 @@ if [[ $a2CloudDisk ]]; then
a2CloudDiskUpdated= a2CloudDiskUpdated=
if [[ $updateADTPro && -f "$a2CloudDisk" ]]; then # does existing 800K disk need updating? if [[ $updateADTPro && -f "$a2CloudDisk" ]]; then # does existing 800K disk need updating?
sudo pkill -f [A]DTPro sudo pkill -f ADTPro
echo "A2CLOUD: Updating ADTPro and VDrive on 800K A2CLOUD disk..." echo "A2CLOUD: Updating ADTPro and VDrive on 800K A2CLOUD disk..."
acmd -g /usr/local/adtpro/disks/VDRIVE-*DSK VEDRIVE - | acmd -p "$a2CloudDisk" VEDRIVE SYS acmd -g /usr/local/adtpro/disks/VDRIVE-*DSK VEDRIVE - | acmd -p "$a2CloudDisk" VEDRIVE SYS
acmd -g /usr/local/adtpro/disks/ADTPRO-*DSK ADTPROAUD - | acmd -p "$a2CloudDisk" ADTPROAUD SYS acmd -g /usr/local/adtpro/disks/ADTPRO-*DSK ADTPROAUD - | acmd -p "$a2CloudDisk" ADTPROAUD SYS
@ -1200,7 +1200,7 @@ if [[ $a2CloudDisk ]]; then
a2CloudDiskUpdated=1 a2CloudDiskUpdated=1
fi fi
if [[ $updateADTPro && -f "$a2CloudDisk140" ]]; then # does existing 140K disk need updating? if [[ $updateADTPro && -f "$a2CloudDisk140" ]]; then # does existing 140K disk need updating?
sudo pkill -f [A]DTPro sudo pkill -f ADTPro
echo "A2CLOUD: Updating ADTPro and VDrive on 140K A2CLOUD disk..." echo "A2CLOUD: Updating ADTPro and VDrive on 140K A2CLOUD disk..."
acmd -g /usr/local/adtpro/disks/ADTPRO-*DSK ADTPRO.BIN - | acmd -p "$a2CloudDisk140" ADTPRO.BIN BIN \$0800 acmd -g /usr/local/adtpro/disks/ADTPRO-*DSK ADTPRO.BIN - | acmd -p "$a2CloudDisk140" ADTPRO.BIN BIN \$0800
acmd -g /usr/local/adtpro/disks/ADTPRO-*DSK ADTPRO - | acmd -p "$a2CloudDisk140" ADTPRO SYS acmd -g /usr/local/adtpro/disks/ADTPRO-*DSK ADTPRO - | acmd -p "$a2CloudDisk140" ADTPRO SYS
@ -1215,7 +1215,7 @@ if [[ $a2CloudDisk ]]; then
fi fi
echo echo
else # building or downloading disks else # building or downloading disks
sudo pkill -f [A]DTPro sudo pkill -f ADTPro
if [[ ! $buildA2CloudDisk ]]; then if [[ ! $buildA2CloudDisk ]]; then
echo "A2CLOUD: Downloading 800K disk image..." echo "A2CLOUD: Downloading 800K disk image..."
wget -qO $a2CloudDisk "${binaryURL}A2CLOUD.PO" wget -qO $a2CloudDisk "${binaryURL}A2CLOUD.PO"
@ -1418,7 +1418,7 @@ fi
if [[ $newImageName ]]; then if [[ $newImageName ]]; then
echo "A2CLOUD: Creating new ${imageSize}K image for virtual drive 1 at" echo "A2CLOUD: Creating new ${imageSize}K image for virtual drive 1 at"
echo " /usr/local/adtpro/disks/$newImageName..." echo " /usr/local/adtpro/disks/$newImageName..."
sudo pkill -f [A]DTPro sudo pkill -f ADTPro
rm /usr/local/adtpro/disks/Virtual.po &>/dev/null rm /usr/local/adtpro/disks/Virtual.po &>/dev/null
mkpo -b $(( $imageSize * 2 )) /usr/local/adtpro/disks/"$newImageName" $prodosVolName mkpo -b $(( $imageSize * 2 )) /usr/local/adtpro/disks/"$newImageName" $prodosVolName
vsd1 -f /usr/local/adtpro/disks/"$newImageName" vsd1 -f /usr/local/adtpro/disks/"$newImageName"