fixed bug in entering 30-day month dates in clock.patch

using new installer -i flag in a2server-update to trigger reinstall

README.md

@@ -13,22 +13,84 @@ relatively modern piece of it.  As such they should be preserved as they are.
 
 ## Developer note
 
-To use the scripts on a server other than Ivan's, you'll want to export
-the shell variable A2SERVER_SCRIPT_URL to the base URL of this repository
-on your server.  The base-URL should be slash-terminated.  You can then run
-the following snippet:
+To use the scripts on your own server, including your local machine:
 
 ~~~ bash
-wget -O a2server-setup ${A2SERVER_SCRIPT_URL}setup/index.txt; source a2server-setup
+export A2SERVER_SCRIPT_URL=http://yoururl.com/
 ~~~
 
-A simple method for installing from a local subdirectory is to `cd` to it and
-then type `python -m SimpleHTTPServer`. Then
-`export A2SERVER_SCRIPT_URL="http://localhost:8000/"`
-or use the IP address of the host machine on your LAN instead of localhost.
+To prevent needing to recompile various packages from source code during
+installation, a number of precompiled binary files are downloaded for Raspbian,
+Debian-x86, and Debian-amd64. If you wish to host these on your own server:
+
+~~~ bash
+export A2SERVER_BINARY_URL=http://yoururl.com/files/
+~~~
+
+You do not need to use a subdirectory called "files", or the same server, but
+that's the normal arrangement. The precompiled packages are available here:
+`http://ivanx.com/a2server/files/dist/a2serverbinaries.tar.gz`
+
+Several Apple II third-party binaries are downloaded during installation, as
+well as third-party source code if precompiled binaries are unavailable or
+you don't wish to use them. If you want these external dependencies locally
+during development, they need to go into a folder called "external" in
+the binaries URL, and that needs to contain folders called "appleii" and
+"source". To download all of these external packages, download and run the
+shell script at
+`http://ivanx.com/a2server/files/dist/getexternal.sh`.
+
+Once you have those:
+
+~~~ bash
+export A2SERVER_NO_EXTERNAL=1
+~~~
+
+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/"
+or "http://lan.ip.address:8000/" for the above URL's.
+
+~~~
+python -m SimpleHTTPServer
+~~~
+
+Once you're set, you can then run the following snippet to install A2SERVER:
+
+~~~
+wget -O setup ${A2SERVER_SCRIPT_URL}setup/index.txt; source setup
+~~~
+
+
+Offline install:
+
+Using locally hosted binaries and external dependencies, it's possible to
+install completely offline if dependent packages have been installed.
+
+If precompiled binaries are available, on Wheezy:
+
+~~~
+sudo apt-get -y install unzip libgnustep-base1.22 libdb5.1 libgcrypt11 libssl1.0.0 attr fuse libglib2.0-0 libattr1 libfuse2
+~~~
+
+If precompiled binaries are available, on Jessie:
+
+~~~
+sudo apt-get -y install unzip unar libdb5.3 libgcrypt20 libssl1.0.0 attr fuse libglib2.0-0 libattr1 libfuse2
+~~~
+
+If precompiled binaries are not available, on Wheezy:
+
+~~~
+sudo apt-get -y install unzip build-essential zlib1g-dev libgnustep-base-dev libz-dev libbz2-dev libssl-dev libicu-dev libdb5.1-dev libgcrypt11-dev libglib2.0-dev libattr1-dev libfuse-dev
+~~~
+
+If precompiled binaries are not available, on Jessie:
+
+~~~
+sudo apt-get -y install unzip unar build-essential zlib1g-dev unzip libssl-dev libdb5.3-dev libgcrypt11-dev libglib2.0-dev libattr1-dev libfuse-dev
+~~~
 
-You should probably export A2SERVER_SCRIPT_URL in your .bashrc or whatever
-file configures your development environment.  Also be advised that as of
-version 1.24 of A2SERVER, you must use the snippet above.
 
 [Ivan's site]: http://appleii.ivanx.com/a2server/

scripts/a2server-2-tools.txt

@@ -7,7 +7,7 @@
 # Ensure URL we'll use ends in a /
 case "$A2SERVER_SCRIPT_URL" in
 	*/) scriptURL="$A2SERVER_SCRIPT_URL" ;;
-	*) scriptURL="${A2SERVER_SCRIPT_URL:-http://ivanx.com/a2server}/" ;;
+	*) scriptURL="${A2SERVER_SCRIPT_URL:-https://rawgit.com/RasppleII/a2server/current}/" ;;
 esac
 case "$A2SERVER_BINARY_URL" in
 	*/) binaryURL="$A2SERVER_BINARY_URL" ;;
@@ -60,7 +60,7 @@ if ! hash nulib2 &> /dev/null; then
 
     cd /tmp
     if [[ $arch && ! -f /tmp/a2server-compileAlways ]]; then
-        { wget -qO- "${binaryURL}precompiled/nulib2-3.1.0a1-${arch}.tgz" | sudo tar Pzx; } &> /dev/null
+        { wget -qO- "${binaryURL}precompiled/nulib2-3.1.0a2-${arch}.tgz" | sudo tar Pzx; } &> /dev/null
     fi
         
     if ! hash nulib2 &> /dev/null; then
@@ -80,14 +80,14 @@ if ! hash nulib2 &> /dev/null; then
         mkdir /tmp/nulib2
         cd /tmp/nulib2
         if [[ $useExternalURL ]]; then
-            wget -q -O nulib2-3.1.0a1.zip "https://github.com/fadden/nulib2/archive/51af83986cd5798daa7e0d82a161c9d3963c72bc.zip"
-            unzip nulib2-3.1.0a1.zip 2> /dev/null
-            rm nulib2-3.1.0a1.zip &> /dev/null
+            wget -q -O nulib2-3.1.0a2.zip "https://github.com/fadden/nulib2/archive/20fe7efb4d37fedf807416c16d74d51d893ea48a.zip"
+            unzip nulib2-3.1.0a2.zip 2> /dev/null
+            rm nulib2-3.1.0a2.zip &> /dev/null
         fi
         if [ ! -d nulib2* ]; then
-            wget -q -O nulib2-3.1.0a1.zip "${binaryURL}external/source/nulib2-3.1.0a1.zip"
-            unzip nulib2-3.1.0a1.zip 2> /dev/null
-            rm nulib2-3.1.0a1.zip &> /dev/null
+            wget -q -O nulib2-3.1.0a2.zip "${binaryURL}external/source/nulib2-3.1.0a2.zip"
+            unzip nulib2-3.1.0a2.zip 2> /dev/null
+            rm nulib2-3.1.0a2.zip &> /dev/null
         fi
         cd nulib2*
         cd nufxlib

scripts/a2server-3-sharing.txt

@@ -17,7 +17,7 @@
 # Ensure URL we'll use ends in a /
 case "$A2SERVER_SCRIPT_URL" in
 	*/) scriptURL="$A2SERVER_SCRIPT_URL" ;;
-	*) scriptURL="${A2SERVER_SCRIPT_URL:-http://appleii.ivanx.com/a2server}/" ;;
+	*) scriptURL="${A2SERVER_SCRIPT_URL:-https://rawgit.com/RasppleII/a2server/current}/" ;;
 esac
 case "$A2SERVER_BINARY_URL" in
 	*/) binaryURL="$A2SERVER_BINARY_URL" ;;
@@ -249,10 +249,13 @@ sudo sed -i 's/#ATALK_BGROUND=no/ATALK_BGROUND=yes/' /etc/default/netatalk
 if [[ ! $(grep 'kernelRelease' /etc/init.d/netatalk) ]]; then
     sudo sed -i 's@\(\tif \[ x\"$ATALKD_RUN\)@\n\t# check for valid AppleTalk kernel module\n\t[[ $ATALKD_RUN == "yes" ]] \&\& { kernelRelease=$(uname -r); kernelMajor=$(cut -d "." -f 1  <<< $kernelRelease); kernelMinor=$(cut -d "." -f 2  <<< $kernelRelease | sed '"'"'s/\\(^[0-9]*\\)[^0-9].*$/\\1/'"'"'); kernelPatch=$(cut -d "." -f 3- <<< $kernelRelease | sed '"'"'s/\\(^[0-9]*\\)[^0-9].*$/\\1/'"'"'); [[ ( $kernelMajor -eq 3 \&\& $kernelMinor -ge 12 \&\& $kernelMinor -le 15 ) \&\& ( ! ( -f /usr/bin/raspi-config \&\& $kernelMinor -eq 12 \&\& $kernelPatch -ge 25 ) ) \&\& ( ( ! -f /lib/modules/$kernelRelease/kernel/net/appletalk/appletalk.ko ) || $(sha1sum /lib/modules/$kernelRelease/kernel/net/appletalk/appletalk.ko | cut -f 1 -d " ") != "ecb239fc084c36de93f6926e7749b80f6024f269" ) ]] \&\& { ATALKD_RUN=no; echo "[AppleTalk networking is not available.]" 1>\&2; } }\n\n\1@' /etc/init.d/netatalk
 fi
+sudo sed -i 's/Starting Netatalk services (this will take a while): /Starting Netatalk services"\n\t\t\t[[ $ATALKD_RUN == "yes" ]] \&\& echo -n " (this will take 45 seconds)"\n\t\t\techo -n ":/' /etc/init.d/netatalk
+sudo sed -i 's/Starting Netatalk services in the background./Netatalk services will be available in 45 seconds./' /etc/init.d/netatalk
+sudo sed -i 's/-n "Restarting Netatalk Daemons (this will take a while)"/"Restarting Netatalk Daemons."/' /etc/init.d/netatalk
 
 # enable MacIPgw support after launching atalkd
 if ! grep -q -i 'macipgw' /etc/init.d/netatalk; then
-    sudo sed -i ':a;N;$!ba;s@\(echo -n " atalkd"\)\(.*# prepare\)@\1\n\n    # start MacIPgw (TCP over AppleTalk) service\n    ps aux | grep -q "[m]acipgw" \&\& sudo killall macipgw 2> /dev/null\n    atalkd_interface=$(grep "^[^ #]" /etc/netatalk/atalkd.conf | tail -1 | cut -d " " -f 1)\n    sysctl -w net.ipv4.ip_forward=1 > /dev/null\n    macipgw -n 8.8.8.8 192.168.151.0 255.255.255.0\n    /sbin/iptables -t nat -A POSTROUTING -o ${atalkd_interface} -j MASQUERADE\n    /sbin/iptables -A FORWARD -i ${atalkd_interface} -o tun0 -m state --state RELATED,ESTABLISHED -j ACCEPT\n    /sbin/iptables -A FORWARD -i tun1 -o ${atalkd_interface} -j ACCEPT\n\n    echo -n " macipgw"\n\2@' /etc/init.d/netatalk
+    sudo sed -i ':a;N;$!ba;s@\(echo -n " atalkd"\)\(.*# prepare\)@\1\n\n\t\t# start MacIPgw (TCP over AppleTalk) service\n\t\tps aux | grep -q "[m]acipgw" \&\& sudo killall macipgw 2> /dev/null || :\n\t\tatalkd_interface=$(grep "^[^ #]" /etc/netatalk/atalkd.conf | tail -1 | cut -d " " -f 1)\n\t\tsysctl -w net.ipv4.ip_forward=1 > /dev/null\n\t\tmacipgw -n 8.8.8.8 192.168.151.0 255.255.255.0\n\t\t/sbin/iptables -t nat -A POSTROUTING -o ${atalkd_interface} -j MASQUERADE\n\t\t/sbin/iptables -A FORWARD -i ${atalkd_interface} -o tun0 -m state --state RELATED,ESTABLISHED -j ACCEPT\n\t\t/sbin/iptables -A FORWARD -i tun1 -o ${atalkd_interface} -j ACCEPT\n\n\t\techo -n " macipgw"\n\2@' /etc/init.d/netatalk
     sudo sed -i 's@\(start-stop-daemon --stop --quiet --oknodo --exec /usr/local/sbin/atalkd.*$\)@\1\n                    echo -n " macipgw"\n            sudo killall macipgw 2> /dev/null@' /etc/init.d/netatalk
 fi
 
@@ -292,12 +295,12 @@ sudo sed -i 's/^~/#share1\n\n#share2/' \
 sudo sed -i 's/^:DEFAULT/#:DEFAULT/' \
 /usr/local/etc/netatalk/AppleVolumes.default
 
-if [[ ! $(grep ^eth0 /usr/local/etc/netatalk/atalkd.conf) && ! $(grep ^wlan0 /usr/local/etc/netatalk/atalkd.conf) ]]; then
+# if [[ ! $(grep ^eth0 /usr/local/etc/netatalk/atalkd.conf) && ! $(grep ^wlan0 /usr/local/etc/netatalk/atalkd.conf) ]]; then
+if [[ $(tac /usr/local/etc/netatalk/atalkd.conf | sed '/./,$!d' | head -1 | cut -c 1) == "#" ]]; then
     # enable netatalk on the default network interface
     # needs -router and -zone to prevent GS/OS AppleShare CDEV crash when used
     # with Dayna or Asante bridges
-    echo -e 'eth0 -router -phase 2 -net 1 -zone "A2SERVER"' \
-    | sudo tee -a /usr/local/etc/netatalk/atalkd.conf > /dev/null
+    echo -e 'eth0 -router -phase 2 -net 1 -zone "A2SERVER"' | sudo tee -a /usr/local/etc/netatalk/atalkd.conf > /dev/null
 fi
 
 # Raspberry Pi
@@ -522,12 +525,12 @@ if [[ -f "/lib/modules/$kernelRelease/kernel/drivers/net/appletalk/ipddp.ko" ]];
     sudo /etc/init.d/netatalk stop &> /dev/null
     sudo rmmod ipddp 2> /dev/null
     sudo rmmod appletalk 2> /dev/null
-    echo "A2SERVER: Attempting to replace AppleTalk kernel module for MacIP use..."
+    echo "A2SERVER: Replacing AppleTalk kernel module (IPDDP disabled) for MacIP use..."
 
     sudo mv /lib/modules/$kernelRelease/kernel/net/appletalk/appletalk.ko /tmp 2> /dev/null
 
     if [[ ${arch%_*} == "debian" ]]; then
-        echo "A2SERVER: Attempting to fetch AppleTalk kernel module for Debian..."
+        echo "A2SERVER: Fetching AppleTalk kernel module for Debian..."
         wget -qO /tmp/appletalk.tgz ${binaryURL}precompiled/appletalk-$kernelRelease-${arch}.tgz
         if [[ $? -eq 0 ]]; then
             # if we found a prebuilt one on a2server site, install it and load it
@@ -555,7 +558,7 @@ if [[ -f "/lib/modules/$kernelRelease/kernel/drivers/net/appletalk/ipddp.ko" ]];
 
         # kernel module compile adapted from from: http://askubuntu.com/a/338403/288003
         for i in 1; do
-            echo "A2SERVER: Attempting to build AppleTalk kernel module..."
+            echo "A2SERVER: Building AppleTalk kernel module..."
             [[ -f /boot/config-$kernelRelease ]] || break
             sudo apt-get -y install linux-headers-$kernelRelease linux-source-$kernelMajorMinor || break
             sudo apt-get -y install build-essential
@@ -639,7 +642,7 @@ if [[ ( ! $(ps aux | grep [a]talkd) ) && ( $isRpi ) ]]; then
 
     # if no AppleTalk module, try to download it from a2server site
     if [[ ! -f /lib/modules/$kernelRelease/kernel/net/appletalk/appletalk.ko ]]; then # check for rpi kernel module
-        echo "A2SERVER: Attempting to install AppleTalk kernel module for Raspbian..."
+        echo "A2SERVER: Installing AppleTalk kernel module for Raspbian..."
         wget -qO /tmp/appletalk.ko.gz ${binaryURL}appletalk-$kernelRelease-rpi.ko.gz
         if [[ $? -eq 0 ]]; then
             # if we found a prebuilt one on a2server site, install it and load it

scripts/a2server-5-netboot.txt

@@ -10,7 +10,7 @@
 # Ensure URL we'll use ends in a /
 case "$A2SERVER_SCRIPT_URL" in
     */) scriptURL="$A2SERVER_SCRIPT_URL" ;;
-    *) scriptURL="${A2SERVER_SCRIPT_URL:-http://ivanx.com/a2server}/" ;;
+    *) scriptURL="${A2SERVER_SCRIPT_URL:-https://rawgit.com/RasppleII/a2server/current}/" ;;
 esac
 case "$A2SERVER_BINARY_URL" in
     */) binaryURL="$A2SERVER_BINARY_URL" ;;
@@ -28,10 +28,6 @@ p8Dir="/srv/A2SERVER/A2FILES"
 diskToolsP8Dir=$p8Dir/Disk.Tools.P8
 
 commDir="/srv/A2SERVER/A2FILES/Comm"
-spectrumDir=$commDir/Spectrum
-protermDir=$commDir/ProTERM
-zlinkDir=$commDir/Z.Link
-adtproDir=$commDir/ADTPro
 
 gsosURL="http://download.info.apple.com/Apple_Support_Area/Apple_Software_Updates/English-North_American/Apple_II/Apple_IIGS_System_6.0.1/"
 gsosBackupURL="http://archive.org/download/download.info.apple.com.2012.11/download.info.apple.com.2012.11.zip/download.info.apple.com%2FApple_Support_Area%2FApple_Software_Updates%2FEnglish-North_American%2FApple_II%2FApple_IIGS_System_6.0.1%2F"
@@ -97,7 +93,7 @@ updateP8YearTables () {
     # 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.
     #
-    # 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.
     #     accepts optional arguments for custom patches
     #     arg1 = year table, comma separated
@@ -173,15 +169,29 @@ updateP8YearTables () {
 
 # bail out on automated netboot setup unless -b is also specified
 [[ -f /tmp/a2server-autoAnswerYes ]] && autoAnswerYes=1 || autoAnswerYes=
+
+netbootInstalled=
+if [[ -f /usr/local/etc/netatalk/a2boot/ProDOS16\ Boot\ Blocks && \
+    -f /usr/local/etc/netatalk/a2boot/ProDOS16\ Image && \
+    -f /usr/local/etc/netatalk/a2boot/Apple\ :2f:2fe\ Boot\ Blocks && \
+    -f /usr/local/etc/netatalk/a2boot/p8 && \
+    -f /usr/local/etc/netatalk/a2boot/Basic.System && \
+    -f $gsosDir/USERS/USER1/SETUP/ATINIT && \
+    -f $gsosDir/USERS/"<ANY USER>"/SETUP/ATINIT ]] ; then
+    netbootInstalled=1
+fi
+REPLY=
 if [[ ! $autoAnswerYes || -f /tmp/a2server-setupNetBoot ]]; then
-    
     if [[ ! $autoAnswerYes ]]; then
-        echo
-        echo "Do you want to set up A2SERVER to be able to boot Apple II"
-        echo -n "computers over the network? "
-        read
-    fi
-    
+        if [[ ! $netbootInstalled ]]; then
+            echo
+            echo "Do you want to set up A2SERVER to be able to boot Apple II"
+            echo -n "computers over the network? "
+            read
+        else
+            echo "A2SERVER is already set up to boot Apple II computers over the network."
+        fi
+    fi    
     if [[ $autoAnswerYes || ${REPLY:0:1} == "Y" || ${REPLY:0:1} == "y" ]]; then
     
         nbmode=1
@@ -189,12 +199,15 @@ if [[ ! $autoAnswerYes || -f /tmp/a2server-setupNetBoot ]]; then
         
         sudo true
         mkdir -p /tmp/netboot
+        rm -r /tmp/netboot/* 2> /dev/null
         cd /tmp/netboot
         
         # this will get "Disk 7" (Apple II Setup) as a raw (block dump) image
         if [[ ! -f /usr/local/etc/netatalk/a2boot/ProDOS16\ Boot\ Blocks ]] \
         || [[ ! -f /usr/local/etc/netatalk/a2boot/ProDOS16\ Image ]] \
-        || [[ ! -f /usr/local/etc/netatalk/a2boot/Apple\ :2f:2fe\ Boot\ Blocks ]]; then
+        || [[ ! -f /usr/local/etc/netatalk/a2boot/Apple\ :2f:2fe\ Boot\ Blocks ]] \
+        || [[ ! -f /usr/local/etc/netatalk/a2boot/p8 ]] \
+        || [[ ! -f /usr/local/etc/netatalk/a2boot/Basic.System ]]; then
             echo "A2SERVER: Downloading Apple II Boot Blocks..."
             cd /tmp/netboot
             
@@ -213,10 +226,10 @@ if [[ ! $autoAnswerYes || -f /tmp/a2server-setupNetBoot ]]; then
             truncate -s 819284 'Disk 7 of 7-Apple II Setup.sea'
             dd if='Disk 7 of 7-Apple II Setup.sea' of=APPLE2SETUP.HDV bs=84 skip=1 2> /dev/null
                 
-            # copy the Boot Blocks into the right place
             mkdir -p a2setup
             sudo mount -t hfs -o ro,loop APPLE2SETUP.HDV a2setup
             sudo mkdir -p /usr/local/etc/netatalk/a2boot
+            sudo rm -r /usr/local/etc/netatalk/a2boot/* 2> /dev/null
             sudo cp -p a2setup/System\ Folder/* /usr/local/etc/netatalk/a2boot
             sudo umount a2setup
             sudo mv /usr/local/etc/netatalk/a2boot/Apple* /usr/local/etc/netatalk/a2boot/'Apple :2f:2fe Boot Blocks'
@@ -259,8 +272,8 @@ if [[ ! $autoAnswerYes || -f /tmp/a2server-setupNetBoot ]]; then
             echo
             echo "A2SERVER: Creating NETBOOT.P8..."
             touch $p8Dir/NETBOOT.P8
-            echo -n -e "\x38\x20\x1f\xfe\x90\x01\x60\xfb\x08\xc2\x30\xf4\x02\x00\xf4\x62\x00\xa2\x03\x0b\x22\x00\x00\xe1\x78\xf4\x00\x00\xf4\x00\x00\xab\xab\x2b\x38\xfb\xce\xf4\x03\xa9\x0c\x8d\x68\xc0\x9c\x47\xc0\x9c\x41\xc0\xa9\x09\x8d\x39\xc0\xa9\xc0\x8d\x39\xc0\x5c\x62\xfa\x00" | \
-              sudo dd of="$p8Dir/NETBOOT.P8" 2> /dev/null
+            echo -n -e "\x38\x20\x1f\xfe\x90\x01\x60\xfb\x08\xc2\x30\xf4\x02\x00\xf4\x62\x00\xa2\x03\x0b\x22\x00\x00\xe1\x78\xf4\x00\x00\xf4\x00\x00\xab\xab\x2b\x38\xfb\xce\xf4\x03\xa9\x0c\x8d\x68\xc0\x9c\x47\xc0\x9c\x41\xc0\xa9\x09\x8d\x39\xc0\xa9\xc0\x8d\x39\xc0\x5c\x62\xfa\x00" \
+            | sudo dd of="$p8Dir/NETBOOT.P8" 2> /dev/null
             afpsync -v $p8Dir > /dev/null
             afptype -p SYS -q $p8Dir/NETBOOT.P8
         fi
@@ -269,8 +282,8 @@ if [[ ! $autoAnswerYes || -f /tmp/a2server-setupNetBoot ]]; then
             echo "A2SERVER: Creating NETBOOT.GSOS..."
             # create tool for setting GSOS boot in battery RAM and rebooting. Props yet again to Geoff Body.
             touch $gsosDir/NETBOOT.GSOS
-            echo -n -e "\x38\x20\x1f\xfe\x90\x01\x60\xfb\x08\xc2\x30\xf4\x01\x00\xf4\x62\x00\xa2\x03\x0b\x22\x00\x00\xe1\x78\xf4\x00\x00\xf4\x00\x00\xab\xab\x2b\x38\xfb\xce\xf4\x03\xa9\x0c\x8d\x68\xc0\x9c\x47\xc0\x9c\x41\xc0\xa9\x09\x8d\x39\xc0\xa9\xc0\x8d\x39\xc0\x5c\x62\xfa\x00" | \
-              sudo dd of="$p8Dir/NETBOOT.GSOS" 2> /dev/null
+            echo -n -e "\x38\x20\x1f\xfe\x90\x01\x60\xfb\x08\xc2\x30\xf4\x01\x00\xf4\x62\x00\xa2\x03\x0b\x22\x00\x00\xe1\x78\xf4\x00\x00\xf4\x00\x00\xab\xab\x2b\x38\xfb\xce\xf4\x03\xa9\x0c\x8d\x68\xc0\x9c\x47\xc0\x9c\x41\xc0\xa9\x09\x8d\x39\xc0\xa9\xc0\x8d\x39\xc0\x5c\x62\xfa\x00" \
+            | sudo dd of="$p8Dir/NETBOOT.GSOS" 2> /dev/null
             afpsync -v $gsosDir > /dev/null
             afptype -p SYS -q $gsosDir/NETBOOT.GSOS
         fi
@@ -278,6 +291,10 @@ if [[ ! $autoAnswerYes || -f /tmp/a2server-setupNetBoot ]]; then
         mkatinit -gs -d -f     # GS/OS registered user and Guest starts up with SYSTEM/FINDER
         mkatinit -d -f guest   # ProDOS 8 Guest starts up with BASIC.SYSTEM (no registered user)
 
+        netbootInstalled=1
+    fi
+
+    if [[ $netbootInstalled ]]; then
         gsosInstall=
         gsosReinstall=1
         if [[ -f "$gsosDir/SYSTEM/START.GS.OS" ]]; then
@@ -299,7 +316,7 @@ if [[ ! $autoAnswerYes || -f /tmp/a2server-setupNetBoot ]]; then
                         echo -n "Are you sure you want to delete your entire GS/OS System folder? "
                         read
                         if [[ ${REPLY:0:1} == "Y" || ${REPLY:0:1} == "y" ]]; then
-                            rm -r "$gsosDir/SYSTEM/* $gsosDir/System/.AppleDouble/*" 2> /dev/null
+                            rm -r "$gsosDir/System"/* "$gsosDir/System/.AppleDouble"/* 2> /dev/null
                             afpsync &> /dev/null
                             echo
                             break
@@ -308,7 +325,7 @@ if [[ ! $autoAnswerYes || -f /tmp/a2server-setupNetBoot ]]; then
                         echo -n "Are you sure you want to reinstall GS/OS over your existing system? "
                         read
                         if [[ ${REPLY:0:1} == "Y" || ${REPLY:0:1} == "y" ]]; then
-                            rm -r "$gsosDir/SYSTEM/START.GS.OS $gsosDir/System/.AppleDouble/START.GS.OS" 2> /dev/null
+                            rm -r "$gsosDir/System/Start.GS.OS $gsosDir/System/.AppleDouble/Start.GS.OS" 2> /dev/null
                             afpsync &> /dev/null
                             echo
                             break
@@ -345,6 +362,8 @@ if [[ ! $autoAnswerYes || -f /tmp/a2server-setupNetBoot ]]; then
                 # echo
                 echo
                 echo "A2SERVER: Downloading GS/OS 6.0.${gsosInstall} installer disk images..."
+                mkdir -p /tmp/netboot
+                rm -r /tmp/netboot/* 2> /dev/null
                 cd /tmp/netboot
                 mkdir -p $imagesDir
                 mkdir -p $netInstallDir
@@ -362,8 +381,8 @@ if [[ ! $autoAnswerYes || -f /tmp/a2server-setupNetBoot ]]; then
                 fi
     
                 # delete previously downloaded installer
-                rm "$imagesDir/* $imagesDir/.AppleDouble/*" 2> /dev/null
-                rm "$netInstallDir/* $netInstallDir/.AppleDouble/*" 2> /dev/null
+                rm "$imagesDir/* $imagesDir/.AppleDouble"/* 2> /dev/null
+                rm "$netInstallDir/* $netInstallDir/.AppleDouble"/* 2> /dev/null
                 afpsync -v $gsosDir > /dev/null
     
                 for diskname in ${diskNames[@]}; do
@@ -456,6 +475,7 @@ if [[ ! $autoAnswerYes || -f /tmp/a2server-setupNetBoot ]]; then
                 }
                 
                 mkdir -p /tmp/netboot
+                rm -r /tmp/netboot/* 2> /dev/null
                 cd /tmp/netboot
     
                 echo "A2SERVER: Preparing GS/OS installer scripts..."    
@@ -482,7 +502,7 @@ if [[ ! $autoAnswerYes || -f /tmp/a2server-setupNetBoot ]]; then
         
         # if [[ ! $autoAnswerYes && (! $gsosInstall || $gsosInstall -lt 2) ]] && ! checkP8YearTables 603; then
         #     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
         # fi
         # if [[ $autoAnswerYes || ${REPLY:0:1} == "Y" || ${REPLY:0:1} == "y" ]]; then
@@ -493,101 +513,120 @@ if [[ ! $autoAnswerYes || -f /tmp/a2server-setupNetBoot ]]; then
 
         # patch ProDOS 8 Thunderclock driver year table based on today's date
         echo
-        echo "A2SERVER: Updating ProDOS 8 Thunderclock driver year tables..."
+        echo "A2SERVER: Updating ProDOS 8 Thunderclock driver year table..."
         mkdir -p /tmp/netboot
+        rm -r /tmp/netboot/* 2> /dev/null
         wget -qO /tmp/netboot/clock.patch.py "${scriptURL}scripts/clock.patch.py"
         updateP8YearTables $(python /tmp/netboot/clock.patch.py $(LANG=C date +"%a %m/%d/%y"))
 
-        if [[ ! $autoAnswerYes ]]; then
-            echo
-            echo "Do you want to download and install utilities for working with"
-            echo -n "disk images and archive files in GS/OS? "
-            read
+        gsosInstalled=""
+        [[ -f "$gsosDir/System/Start.GS.OS" ]] && gsosInstalled="GS/OS and "
+        p8ToolsInstalled=
+        [[ -f $diskToolsP8Dir/SHRINKIT && -f $diskToolsP8Dir/DSK2FILE && -f $diskToolsP8Dir/SYSUTIL ]] && p8ToolsInstalled=1
+        gsosToolsInstalled=
+        [[ -f $imageToolsDir/Asimov && -f $gsosDir/System/System.Setup/MountIt && -f $imageToolsDir/GSHK ]] && gsosToolsInstalled=1
+        toolsInstalled=
+        if [[ $gsosInstalled ]]; then
+            [[ $gsosToolsInstalled && $p8ToolsInstalled ]] && toolsInstalled=1
+        else
+            toolsInstalled=$p8ToolsInstalled
         fi
-        if [[ $autoAnswerYes || ${REPLY:0:1} == "Y" || ${REPLY:0:1} == "y" ]]; then
-    
-            # download image tools and put them in IMAGE.TOOLS
-            echo "A2SERVER: Downloading GS/OS disk image utilities..."
-            mkdir -p $imageToolsDir
-    
-            # get Asimov2 (for GS/OS)
-            echo -n "Asimov 2.0"
-            if [[ -f $imageToolsDir/Asimov ]]; then
-                echo " is already installed."
+        REPLY=
+        if [[ ! $autoAnswerYes ]]; then
+            if [[ ! $toolsInstalled ]]; then
+                echo
+                echo "Do you want to download and install utilities for working with"
+                echo -n "disk images and archive files in ${gsosInstalled}ProDOS 8? "
+                read
             else
                 echo
-                cd /tmp/netboot
-                if [[ $useExternalURL ]]; then
-                    wget -qO Asimov.shk http://www.ninjaforce.com/downloads/Asimov.shk
-                    nulib2 -x -s Asimov.shk &> /dev/null
-                fi
-                if [[ ! -d Asimov ]]; then
-                    wget -qO Asimov.shk ${binaryURL}external/appleii/Asimov.shk
-                    nulib2 -x -s Asimov.shk &> /dev/null
-                fi
-                cp -p Asimov/Asimov $imageToolsDir/Asimov
-                afpsync -v $gsosDir > /dev/null
-                cat Asimov/Asimov_rsrc_ >> $imageToolsDir/.AppleDouble/Asimov
-                afptype -p S16 -q $imageToolsDir/Asimov
+                echo "A2SERVER: Disk image and archive utilities are already installed."
             fi
+        fi
+        if [[ $gsosInstalled ]]; then
+            if [[ $autoAnswerYes || ${REPLY:0:1} == "Y" || ${REPLY:0:1} == "y" ]]; then
         
-            echo -n "GS-ShrinkIt 1.1"
-            # get GS-ShrinkIt
-            if [[ -f $imageToolsDir/GSHK ]]; then
-                echo " is already installed."
-            else
-                echo
-                mkdir -p /tmp/netboot/gshk
-                cd /tmp/netboot/gshk
-                if [[ $useExternalURL ]]; then
-                    wget -qO gshk11.sea http://web.archive.org/web/20131031160750/http://nulib.com/library/gshk11.sea
-                    #wget -qO gshk11.sea http://www.nulib.com/library/gshk11.sea
-                    nulib2 -x -s gshk11.sea &> /dev/null
+                # download image tools and put them in IMAGE.TOOLS
+                echo "A2SERVER: Downloading GS/OS disk image utilities..."
+                mkdir -p $imageToolsDir
+        
+                # get Asimov2 (for GS/OS)
+                echo -n "Asimov 2.0"
+                if [[ -f $imageToolsDir/Asimov ]]; then
+                    echo " is already installed."
+                else
+                    echo
+                    cd /tmp/netboot
+                    if [[ $useExternalURL ]]; then
+                        wget -qO Asimov.shk http://www.ninjaforce.com/downloads/Asimov.shk
+                        nulib2 -x -s Asimov.shk &> /dev/null
+                    fi
+                    if [[ ! -d Asimov ]]; then
+                        wget -qO Asimov.shk ${binaryURL}external/appleii/Asimov.shk
+                        nulib2 -x -s Asimov.shk &> /dev/null
+                    fi
+                    cp -p Asimov/Asimov $imageToolsDir/Asimov
+                    afpsync -v $gsosDir > /dev/null
+                    cat Asimov/Asimov_rsrc_ >> $imageToolsDir/.AppleDouble/Asimov
+                    afptype -p S16 -q $imageToolsDir/Asimov
                 fi
-                if [[ ! -f GSHK ]]; then
-                    wget -qO gshk11.sea ${binaryURL}external/appleii/gshk11.sea
-                    nulib2 -x -s gshk11.sea &> /dev/null
+            
+                echo -n "GS-ShrinkIt 1.1"
+                # get GS-ShrinkIt
+                if [[ -f $imageToolsDir/GSHK ]]; then
+                    echo " is already installed."
+                else
+                    echo
+                    mkdir -p /tmp/netboot/gshk
+                    cd /tmp/netboot/gshk
+                    if [[ $useExternalURL ]]; then
+                        wget -qO gshk11.sea http://www.nulib.com/library/gshk11.sea
+                        if (( $? != 0 )); then
+                            wget -qO gshk11.sea http://web.archive.org/web/20131031160750/http://nulib.com/library/gshk11.sea
+                        fi
+                        nulib2 -x -s gshk11.sea &> /dev/null
+                    fi
+                    if [[ ! -f GSHK ]]; then
+                        wget -qO gshk11.sea ${binaryURL}external/appleii/gshk11.sea
+                        nulib2 -x -s gshk11.sea &> /dev/null
+                    fi
+                    cp -p GSHK $imageToolsDir/GSHK
+                    afpsync -v $gsosDir > /dev/null
+                    cat GSHK_rsrc_ >> $imageToolsDir/.AppleDouble/GSHK
+                    afptype -p S16 -a DB07 -q $imageToolsDir/GSHK
+                    cd /tmp/netboot
                 fi
-                cp -p GSHK $imageToolsDir/GSHK
-                afpsync -v $gsosDir > /dev/null
-                cat GSHK_rsrc_ >> $imageToolsDir/.AppleDouble/GSHK
-                afptype -p S16 -a DB07 -q $imageToolsDir/GSHK
-                cd /tmp/netboot
-            fi
-    
-            echo -n "MountIt 1.4"    
-            # get MountIt (for GS/OS)
-            if [[ -f $imageToolsDir/MOUNTIT.SHK ]]; then
-                echo " is already installed."
-            else
-                echo
-                mkdir -p /tmp/netboot/mountit
-                cd /tmp/netboot/mountit
-                if [[ $useExternalURL ]]; then
-                    wget -q -O MOUNTIT.SHK http://www.brutaldeluxe.fr/products/apple2gs/MOUNTIT.SHK
-                    cppo -s -ad MOUNTIT.SHK System:System.Setup:MountIt . &> /dev/null
-                    cppo -s -ad MOUNTIT.SHK ReadMe . &> /dev/null
+        
+                echo -n "MountIt 1.4"    
+                # get MountIt (for GS/OS)
+                if [[ -f $gsosDir/System/System.Setup/MountIt ]]; then
+                    echo " is already installed."
+                else
+                    echo
+                    mkdir -p /tmp/netboot/mountit
+                    cd /tmp/netboot/mountit
+                    if [[ $useExternalURL ]]; then
+                        wget -q -O MOUNTIT.SHK http://www.brutaldeluxe.fr/products/apple2gs/MOUNTIT.SHK
+                        if (( $? != 0 )); then
+                            wget -q -O http://web.archive.org/web/20150201044930/http://brutaldeluxe.fr/products/apple2gs/MOUNTIT.SHK
+                        fi
+                        cppo -s -ad MOUNTIT.SHK System:System.Setup:MountIt . &> /dev/null
+                        cppo -s -ad MOUNTIT.SHK ReadMe . &> /dev/null
+                    fi
+                    if [[ ! -f ReadMe ]]; then
+                        wget -qO MOUNTIT.SHK ${binaryURL}external/appleii/MOUNTIT.SHK
+                        cppo -s -ad MOUNTIT.SHK System:System.Setup:MountIt . &> /dev/null
+                        cppo -s -ad MOUNTIT.SHK ReadMe . &> /dev/null
+                    fi
+                    cpAD ./MountIt $gsosDir/System/System.Setup
+                    mkdir -p $gsosDir/GSOS.Installer/Image.Tools/MountIt
+                    cpAD ./ReadMe $gsosDir/GSOS.Installer/Image.Tools/MountIt
+                    afpsync -v $gsosDir > /dev/null
                 fi
-                if [[ ! -f ReadMe ]]; then
-                    wget -qO MOUNTIT.SHK ${binaryURL}external/appleii/MOUNTIT.SHK
-                    cppo -s -ad MOUNTIT.SHK System:System.Setup:MountIt . &> /dev/null
-                    cppo -s -ad MOUNTIT.SHK ReadMe . &> /dev/null
-                fi
-                cpAD ./MountIt $gsosDir/System/System.Setup
-                mkdir -p $gsosDir/GSOS.Installer/Image.Tools/MountIt
-                cpAD ./ReadMe $gsosDir/GSOS.Installer/Image.Tools/MountIt
-                afpsync -v $gsosDir > /dev/null
             fi
         fi
 
-        if [[ ! $autoAnswerYes ]]; then
-            echo
-            echo "Do you want to download and install utilities for working with"
-            echo -n "disk images and archive files in ProDOS 8? "
-            read
-        fi
         if [[ $autoAnswerYes || ${REPLY:0:1} == "Y" || ${REPLY:0:1} == "y" ]]; then
-    
             echo "A2SERVER: Downloading ProDOS 8 disk image utilities..."
 
             mkdir -p $diskToolsP8Dir
@@ -600,14 +639,17 @@ if [[ ! $autoAnswerYes || -f /tmp/a2server-setupNetBoot ]]; then
                 echo
                 cd /tmp/netboot
                 if [[ $useExternalURL ]]; then
-                    wget -qO shrinkit.sdk http://web.archive.org/web/20131031160750/http://www.nulib.com/library/shrinkit.sdk
-                    nulib2 -x -s shrinkit.sdk &> /dev/null
+                    wget -qO shrinkit.sdk http://www.nulib.com/library/shrinkit.sdk
+                    if (( $? != 0 )); then
+                        wget -qO shrinkit.sdk http://web.archive.org/web/20131031160750/http://www.nulib.com/library/shrinkit.sdk
+                    fi
+                    nulib2 -x -s -e shrinkit.sdk &> /dev/null
                 fi
-                if [[ ! -f SHRINKIT ]]; then
+                if [[ ! -f "SHRINKIT#000118i" ]]; then
                     wget -qO shrinkit.sdk ${binaryURL}external/appleii/shrinkit.sdk
-                    nulib2 -x -s shrinkit.sdk &> /dev/null
+                    nulib2 -x -s -e shrinkit.sdk &> /dev/null
                 fi
-                cppo -s -ad SHRINKIT /SHRINKIT/SHRINKIT $diskToolsP8Dir &> /dev/null
+                cppo -s -ad "SHRINKIT#000118i" /SHRINKIT/SHRINKIT $diskToolsP8Dir &> /dev/null
                 afpsync -v $sharepath > /dev/null
             fi
         
@@ -641,8 +683,8 @@ if [[ ! $autoAnswerYes || -f /tmp/a2server-setupNetBoot ]]; then
                     wget --max-redirect 0 -qO Apple_II_System_Disk_3.2.sea.bin http://download.info.apple.com/Apple_Support_Area/Apple_Software_Updates/English-North_American/Apple_II/Apple_II_Supplemental/Apple_II_System_Disk_3.2.sea.bin
                     if (( $? != 0 )); then
                         wget -qO Apple_II_System_Disk_3.2.sea.bin http://archive.org/download/download.info.apple.com.2012.11/download.info.apple.com.2012.11.zip/download.info.apple.com%2FApple_Support_Area%2FApple_Software_Updates%2FEnglish-North_American%2FApple_II%2FApple_II_Supplemental%2FApple_II_System_Disk_3.2.sea.bin
-                        unar -k skip Apple_II_System_Disk_3.2.sea.bin &> /dev/null
                     fi
+                    unar -k skip Apple_II_System_Disk_3.2.sea.bin &> /dev/null
                 fi
                 if [[ ! -f 'Apple II System Disk 3.2.sea' ]]; then
                     wget -qO Apple_II_System_Disk_3.2.sea.bin ${binaryURL}external/appleii/Apple_II_System_Disk_3.2.sea.bin
@@ -659,12 +701,27 @@ if [[ ! $autoAnswerYes || -f /tmp/a2server-setupNetBoot ]]; then
     
         fi
 
+        p8CommInstalled=
+        [[ -f $commDir/ProTERM/PROTERM && -f $commDir/Z.Link/Z.LINK && -f $commDir/ADTPro/ADTPRO && -f $commDir/ADTPro/VSDRIVE ]] && p8CommInstalled=1
+        gsosCommInstalled=
+        [[ -f $commDir/Spectrum/Spectrum && -f $commDir/SAM2/SAM2 && -f $commDir/SAFE2/SAFE2 && -f $commDir/SNAP/SNAP && -f $gsosDir/System/CDevs/TCPIP ]] && gsosCommInstalled=1
+        commInstalled=
+        if [[ $gsosInstalled ]]; then
+            [[ $gsosCommInstalled && $p8CommInstalled ]] && commInstalled=1
+        else
+            commInstalled=$p8CommInstalled
+        fi
+        REPLY=
         if [[ ! $autoAnswerYes ]]; then
-            [[ -f "$gsosDir/System/Start.GS.OS" ]] && gsosInstalled="GS/OS and " || gsosInstalled=
-            echo
-            echo "Do you want to download communications software for"
-            echo -n "$gsosInstalled""ProDOS 8? "
-            read
+            if [[ ! $commInstalled ]]; then
+                echo
+                echo "Do you want to download communications software for"
+                echo -n "$gsosInstalled""ProDOS 8? "
+                read
+            else
+                echo
+                echo "A2SERVER: Communications software is already installed."
+            fi
         fi
         if [[ $autoAnswerYes || ${REPLY:0:1} == "Y" || ${REPLY:0:1} == "y" ]]; then
     
@@ -673,29 +730,43 @@ if [[ ! $autoAnswerYes || -f /tmp/a2server-setupNetBoot ]]; then
             mkdir -p $commDir
 
             if [[ $gsosInstalled ]]; then
-                echo -n "Spectrum"
+
+                unset safeUrl samUrl snapUrl safeVer samVer snapVer
+                if [[ $useExternalURL ]]; then
+                    html=$(wget -qO- http://speccie.co.uk/speccie/Site/Download_Centre_files/widget1_markup.html)
+                    safeUrl=$(echo "$html" | grep -i 'safe2.*bxy' | tr '<>' '\n' | grep href | cut -d '=' -f 2 | tr -d '"')
+                    samUrl=$(echo "$html" | grep -i 'sam2.*bxy' | tr '<>' '\n' | grep href | cut -d '=' -f 2 | tr -d '"')
+                    snapUrl=$(echo "$html" | grep -i 'snap.*bxy' | tr '<>' '\n' | grep href | cut -d '=' -f 2 | tr -d '"')
+                    safeVer=$(echo $safeUrl | rev | cut -d '/' -f 1 | cut -d '.' -f 2 | rev | cut -c 5- | sed 's/./.&/g' | cut -c 2-)
+                    samVer=$(echo $samUrl | rev | cut -d '/' -f 1 | cut -d '.' -f 2 | rev | cut -c 4- | sed 's/./.&/g' | cut -c 2-)
+                    snapVer=$(echo $snapUrl | rev | cut -d '/' -f 1 | cut -d '.' -f 2 | rev | cut -c 5- | sed 's/./.&/g' | cut -c 2-)
+                    spectrumVer=$(echo "$html" | grep 'Spectrum.*Gold.2mg' | tr '<>' '\n' | grep '^Spectrum.*2mg$' | cut -d ' ' -f 2)
+                fi
+                
+                echo -n "Spectrum $spectrumVer"
                 # get Spectrum
-                if [[ -f $spectrumDir/Spectrum ]]; then
+                if [[ -f $commDir/Spectrum/Spectrum ]]; then
                     echo " is already installed."
                 else
                     echo
-                    mkdir -p $spectrumDir
+                    mkdir -p $commDir/Spectrum
                     # remove images that might have been installed by 1.2.5
-                    cd $spectrumDir
+                    cd $commDir/Spectrum
                     rm SPECTRUM.HDV MANUALS.HDV SOUNDS.HDV EXTRAS.HDV &> /dev/null
                     # install Spectrum into GS/OS
                     mkdir -p /tmp/netboot/spectrum
                     cd /tmp/netboot/spectrum
                     if [[ $useExternalURL ]]; then
                         wget -qO spectrum_gold_2mg.zip http://www.speccie.co.uk/speccie/software/spectrum_gold_2mg.zip
-                        unzip -p spectrum_gold_2mg.zip 2> /dev/null | dd bs=64 skip=1 of=Spectrum.Gold.HDV 2> /dev/null
+                        unzip spectrum_gold_2mg.zip Spectrum.Gold.2mg &> /dev/null
                     fi
-                    if [[ ! -f Spectrum.Gold.HDV || $(wc -c < Spectrum.Gold.HDV) -eq 0 ]]; then
+                    if [[ ! -f Spectrum.Gold.2mg || $(wc -c < Spectrum.Gold.2mg) -eq 0 ]]; then
                         wget -qO spectrum_gold_2mg.zip ${binaryURL}external/appleii/spectrum_gold_2mg.zip
-                        unzip -p spectrum_gold_2mg.zip 2> /dev/null | dd bs=64 skip=1 of=Spectrum.Gold.HDV 2> /dev/null
+                        unzip spectrum_gold_2mg.zip Spectrum.Gold.2mg &> /dev/null
                     fi
-                    cppo -s -ad Spectrum.Gold.HDV . &> /dev/null
+                    cppo -s -ad Spectrum.Gold.2mg . &> /dev/null
                     userFolder=$(tr [:lower:] [:upper:] <<< $USER)
+                    
                     for thisFolder in \
                       Installer/Extras/CDEvs^System/CDevs \
                       Installer/Extras/Tools^System/Tools \
@@ -703,10 +774,10 @@ if [[ ! $autoAnswerYes || -f /tmp/a2server-setupNetBoot ]]; then
                       Installer/Extras/System.Setup^System/System.Setup \
                       Installer/Help^System/Desk.Accs \
                       Installer/Spectrum.Sounds^System/Sounds \
-                      Spectrum.2.5.4/Add.Ons^USERS/$userFolder/Add.Ons \
-                      Spectrum.2.5.4/Spectrum.Script^USERS/$userFolder/Spectrum.Script \
-                      Spectrum.2.5.4/Add.Ons^Comm/Spectrum/Add.Ons \
-                      Spectrum.2.5.4/Spectrum.Script^Comm/Spectrum/Spectrum.Script \
+                      Spectrum.*/Add.Ons^USERS/$userFolder/Add.Ons \
+                      Spectrum.*/Spectrum.Script^USERS/$userFolder/Spectrum.Script \
+                      Spectrum.*/Add.Ons^Comm/Spectrum/Add.Ons \
+                      Spectrum.*/Spectrum.Script^Comm/Spectrum/Spectrum.Script \
                       Manuals^Comm/Spectrum/Manuals
                     do
                         mkdir -p $gsosDir/"${thisFolder##*^}"
@@ -714,8 +785,8 @@ if [[ ! $autoAnswerYes || -f /tmp/a2server-setupNetBoot ]]; then
                         mkdir -p $gsosDir/"${thisFolder##*^}"/.AppleDouble
                         cp -R Spectrum.Gold/${thisFolder%%^*}/.AppleDouble/* $gsosDir/"${thisFolder##*^}"/.AppleDouble
                     done
-                    cpAD Spectrum.Gold/Installer/SoundPatch $spectrumDir
-                    cpAD Spectrum.Gold/Spectrum.2.5.4/Spectrum $spectrumDir
+                    cpAD Spectrum.Gold/Installer/SoundPatch $commDir/Spectrum
+                    cpAD Spectrum.Gold/Spectrum.*/Spectrum $commDir/Spectrum
                     afpsync -v $gsosDir > /dev/null
                 fi
 
@@ -727,7 +798,7 @@ if [[ ! $autoAnswerYes || -f /tmp/a2server-setupNetBoot ]]; then
                     mkdir -p /tmp/netboot/marinetti
                     cd /tmp/netboot/marinetti
 
-                    # Marinetti 3.0b1
+                    # Marinetti 3.0b1 -- had to repackage because installer is GS/OS self-contained app
                     wget -qO MarinettiB1.SHK ${binaryURL}appleii/MarinettiB1.SHK
                     cppo -ad -s -n MarinettiB1.SHK $gsosDir > /dev/null
 
@@ -748,7 +819,7 @@ if [[ ! $autoAnswerYes || -f /tmp/a2server-setupNetBoot ]]; 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
                     fi
-                    cppo -ad -s PPPX.1.3d4.SHK . &> /dev/null
+                    cppo -ad -s PPPX.1.3d4.SHK . > /dev/null
                     cd PPPX.1.3d4
                     cpAD PPP.scripted $gsosDir/System/TCPIP
                     cpAD PPP.Script.DOC $commDir/Marinetti/Documentation
@@ -779,41 +850,160 @@ if [[ ! $autoAnswerYes || -f /tmp/a2server-setupNetBoot ]]; then
 
                     afpsync -v $gsosDir > /dev/null
                 fi
-            fi
 
-            echo -n "ProTERM and Z-Link"
+                echo -n "SAFE2 $safeVer"
+                if [[ -f $commDir/SAFE2/SAFE2 ]]; then
+                    echo " is already installed."
+                else
+                    echo
+                    mkdir -p $commDir/SAFE2
+                    mkdir -p /tmp/netboot/safe2
+                    cd /tmp/netboot/safe2
+                    if [[ $useExternalURL ]]; then
+                        [[ ! $safeUrl ]] && safeUrl="http://www.speccie.co.uk/speccie/software/safe229.bxy"
+                        wget -qO safe2.bxy "$safeUrl"
+                        cppo -s -ad safe2.bxy . &> /dev/null
+                    fi
+                    if [[ ! -f SAFE2.Archive/Safe2 ]]; then
+                        wget -qO safe2.bxy ${binaryURL}external/appleii/safe2.bxy
+                        cppo -s -ad safe2.bxy . &> /dev/null
+                    fi
+                    cd SAFE2.Archive
+                    cpAD Safe2 $commDir/SAFE2
+                    cpAD The.Manual $commDir/SAFE2
+                    cpAD Read.Me.First $commDir/SAFE2
+                    cpAD Version.History $commDir/SAFE2
+                    cpAD Fonts/SAFE.8 $gsosDir/System/Fonts
+                    cpAD Fonts/Shaston.16 $gsosDir/System/Fonts
+                    cpAD TimeZone/TimeZone $gsosDir/System/CDEvs
+                    cpAD TimeZone/Tool056 $gsosDir/System/Tools
+                    rm -r $gsosDir/System/Desk.Accs/Help.Files/SAFE2 2> /dev/null
+                    mv Help/Help.Files/SAFE2 $gsosDir/System/Desk.Accs/Help.Files
+                    wget -qO- ${binaryURL}safe2-setup.tgz | tar Pzx
+
+                    afpsync -v $gsosDir > /dev/null
+                fi
+
+                echo -n "SAM2 $samVer"
+                if [[ -f $commDir/SAM2/SAM2 ]]; then
+                    echo " is already installed."
+                else
+                    echo
+                    mkdir -p $commDir/SAM2
+                    mkdir -p $commDir/SAM2/SAM2.Data
+                    mkdir -p /tmp/netboot/sam2
+                    cd /tmp/netboot/sam2
+                    if [[ $useExternalURL ]]; then
+                        [[ ! $samUrl ]] && samUrl="http://www.speccie.co.uk/speccie/software/sam205.bxy"
+                        wget -qO sam2.bxy "$samUrl"
+                        cppo -s -ad sam2.bxy . &> /dev/null
+                    fi
+                    if [[ ! -f SAM2.Archive/SAM2/SAM2 ]]; then
+                        wget -qO sam2.bxy ${binaryURL}external/appleii/sam2.bxy
+                        cppo -s -ad sam2.bxy . &> /dev/null
+                    fi
+                    cd SAM2.Archive
+                    cpAD SAM2/SAM2 $commDir/SAM2
+                    cpAD SAM2/SAM2.Data/Taglines $commDir/SAM2/SAM2.Data
+                    cpAD Sounds/SP.Snds.Aux $gsosDir/System/Sounds
+                    cpAD Fonts/SAM.8 $gsosDir/System/Fonts
+                    cpAD Fonts/SAM.10 $gsosDir/System/Fonts
+                    cpAD The.Manual $commDir/SAM2
+                    cpAD Read.Me.First $commDir/SAM2
+                    cpAD Version.History $commDir/SAM2
+                    rm -r $gsosDir/System/Desk.Accs/Help.Files/SAM2 2> /dev/null
+                    mv Help/Help.Files/SAM2 $gsosDir/System/Desk.Accs/Help.Files
+                    # cpAD Fonts/SIS.3.10 $gsosDir/System/Fonts
+                    # cpAD Fonts/SIS.4.10 $gsosDir/System/Fonts
+                    # cpAD Tools/HTMLTool/TOOL130 $gsosDir/System/Tools
+                    # cpAD Tools/Hierarchic/Hierarchic $gsosDir/System/CDEvs
+                    # cpAD Fonts/Shaston.16 $gsosDir/System/Fonts
+
+                    afpsync -v $gsosDir > /dev/null
+                fi
+
+                echo -n "SNAP $snapVer"
+                if [[ -f $commDir/SNAP/SNAP ]]; then
+                    echo " is already installed."
+                else
+                    echo
+                    mkdir -p $commDir/SNAP
+                    mkdir -p /tmp/netboot/snap
+                    cd /tmp/netboot/snap
+                    if [[ $useExternalURL ]]; then
+                        [[ ! $snapUrl ]] && snapUrl="http://www.speccie.co.uk/speccie/software/snap118.bxy"
+                        wget -qO snap.bxy "$snapUrl"
+                        cppo -s -ad snap.bxy . &> /dev/null
+                    fi
+                    if [[ ! -f SNAP.Archive/SNAP ]]; then
+                        wget -qO snap.bxy ${binaryURL}external/appleii/snap.bxy
+                        cppo -s -ad snap.bxy . &> /dev/null
+                    fi
+                    cd SNAP.Archive
+                    cpAD SNAP $commDir/SNAP
+                    cpAD Fonts/SNAP.8 $gsosDir/System/Fonts
+                    cpAD Fonts/SNAP.10 $gsosDir/System/Fonts
+                    cpAD The.Manual $commDir/SNAP
+                    cpAD Read.Me.First $commDir/SNAP
+                    cpAD Change.List $commDir/SNAP
+                    cpAD Quick.Start $commDir/SNAP
+                    rm -r $gsosDir/System/Desk.Accs/Help.Files/SNAP 2> /dev/null
+                    mv Help/Help.Files/SNAP $gsosDir/System/Desk.Accs/Help.Files
+                    wget -qO- ${binaryURL}snap-setup.tgz | tar Pzx
+                    # cpAD Fonts/SIS.3.10 $gsosDir/System/Fonts
+                    # cpAD Fonts/SIS.4.10 $gsosDir/System/Fonts
+                    # cpAD Tools/HTMLTool/TOOL130 $gsosDir/System/Tools
+                    # cpAD Tools/Hierarchic/Hierarchic $gsosDir/System/CDEvs
+                    # cpAD Fonts/Shaston.16 $gsosDir/System/Fonts
+
+                    afpsync -v $gsosDir > /dev/null
+                fi
+             fi
+
+            echo -n "ProTERM 3.1"
             # get A2CLOUD disk and copy from there
-            if [[ -f $protermDir/PROTERM ]]; then
-                echo " are already installed."
+            if [[ -f $commDir/ProTERM/PROTERM ]]; then
+                echo " is already installed."
             else
                 echo
-                mkdir -p $protermDir
-                mkdir -p $protermDir/.AppleDouble
-                mkdir -p $zlinkDir
-                mkdir -p $zlinkDir/.AppleDouble
+                mkdir -p $commDir/ProTERM
+                mkdir -p $commDir/ProTERM/.AppleDouble
                 cd /tmp/netboot
                 wget -qO A2CLOUD.HDV "${binaryURL}appleii/A2CLOUD.HDV"
-                cppo -ad A2CLOUD.HDV . &> /dev/null
+                cppo -s -ad A2CLOUD.HDV . &> /dev/null
                 cd A2CLOUD
-                mv *PT3* *PROTERM* $protermDir
-                mv Z.LINK $zlinkDir
+                mv *PT3* *PROTERM* $commDir/ProTERM
                 cd .AppleDouble
-                mv *PT3* *PROTERM* $protermDir/.AppleDouble
-                mv Z.LINK $zlinkDir/.AppleDouble
+                mv *PT3* *PROTERM* $commDir/ProTERM/.AppleDouble
                 afpsync -v $gsosDir > /dev/null
             fi            
 
-            echo -n "ADTPro and VSDRIVE"
-            if [[ -f $adtproDir/ADTPRO ]]; then
-                echo " are already installed."
+            echo -n "Z-Link 12-15-91"
+            # get A2CLOUD disk and copy from there
+            if [[ -f $commDir/Z.Link/Z.LINK ]]; then
+                echo " is already installed."
             else
-                mkdir -p $adtproDir
-                mkdir -p $adtproDir/.AppleDouble
+                echo
+                mkdir -p $commDir/Z.Link
+                mkdir -p $commDir/Z.Link/.AppleDouble
+                cd /tmp/netboot/A2CLOUD
+                mv Z.LINK $commDir/Z.Link
+                cd .AppleDouble
+                mv Z.LINK $commDir/Z.Link/.AppleDouble
+                afpsync -v $gsosDir > /dev/null
+            fi            
+
+            echo -n "ADTPro 2.0.1"
+            if [[ -f $commDir/ADTPro/ADTPRO ]]; then
+                echo " is already installed."
+            else
+                mkdir -p $commDir/ADTPro
+                mkdir -p $commDir/ADTPro/.AppleDouble
                 echo
                 cd /tmp/netboot/A2CLOUD
-                mv *ADTPRO* *VEDRIVE* *VSDRIVE* $adtproDir
+                mv *ADTPRO* *VEDRIVE* *VSDRIVE* $commDir/ADTPro
                 cd .AppleDouble
-                mv *ADTPRO* *VEDRIVE* *VSDRIVE* $adtproDir/.AppleDouble
+                mv *ADTPRO* *VEDRIVE* *VSDRIVE* $commDir/ADTPro/.AppleDouble
                 afpsync -v $gsosDir > /dev/null
             fi            
 
@@ -834,31 +1024,30 @@ if [[ ! $autoAnswerYes || -f /tmp/a2server-setupNetBoot ]]; then
     
     fi
 
-    if [[ ! $autoAnswerYes ]]; then
-        echo
-        echo "Do you want to download the patch required for using"
-        echo -n "a Farallon LocalTalk-to-Ethernet bridge with GS/OS? "
-        read
-    fi
-    if [[ $autoAnswerYes || ${REPLY:0:1} == "Y" || ${REPLY:0:1} == "y" ]]; then
-        # Farallon bridge patch for GS/OS courtesy of Geoff Body
-        echo "A2SERVER: Downloading Farallon bridge patch..."
-        wget -qO /tmp/FARALLON.PO "${binaryURL}appleii/FARALLON.B1.PO" &> /dev/null
-        if [[ -d $gsosDir/SYSTEM/SYSTEM.SETUP ]]; then
+    REPLY=
+    if [[ -d $gsosDir/SYSTEM/SYSTEM.SETUP ]]; then
+        if [[ ! $autoAnswerYes ]]; then
+            if [[ ! -f $gsosDir/SYSTEM/SYSTEM.SETUP/ATALKIRQ ]]; then
+                echo
+                echo "Do you want to download the patch required for using"
+                echo -n "a Farallon LocalTalk-to-Ethernet bridge with GS/OS? "
+                read
+            else
+                echo
+                echo "A2SERVER: The Farallon bridge patch has already been installed."
+            fi
+        fi
+        if [[ $autoAnswerYes || ${REPLY:0:1} == "Y" || ${REPLY:0:1} == "y" ]]; then
+            # Farallon bridge patch for GS/OS courtesy of Geoff Body
+            echo "A2SERVER: Downloading Farallon bridge patch..."
+            wget -qO /tmp/FARALLON.PO "${binaryURL}appleii/FARALLON.B1.PO" &> /dev/null
             cppo -s -ad /tmp/FARALLON.PO /ATALKPATCH/ATALKIRQ $gsosDir/SYSTEM/SYSTEM.SETUP &> /dev/null
             echo
             echo "A2SERVER: The Farallon bridge patch is installed."
-        else
-            cppo -s -ad /tmp/FARALLON.PO /ATALKPATCH/ATALKIRQ $gsosDir &> /dev/null
             echo
-            echo "On your Apple IIgs, copy the file ATALKIRQ in /A2SHARED to the"
-            echo "SYSTEM.SETUP folder of the SYSTEM folder of your GSOS startup disk,"
-            echo "or, if you can't, download the patch from the A2SERVER web site."
+            echo "Note: Farallon bridges can only be used in GS/OS (with this patch)"
+            echo "and Apple IIe computers. Apple IIgs computers which network boot"
+            echo "directly into ProDOS 8 will freeze after a few minutes."
         fi
-        echo
-        echo "Note: Farallon bridges can only be used in GS/OS (with this patch)"
-        echo "and Apple IIe computers. Apple IIgs computers which network boot"
-        echo "directly into ProDOS 8 will freeze after a few minutes."
     fi
-
 fi

scripts/clock.patch.py

@@ -100,7 +100,7 @@ while True:                                     # 999  REM  get the user's input
         if (mo == 4 or                          # 1162  IF (MO = 4 OR MO = 6 OR MO = 9 OR MO = 11) AND DA > 30 THEN 1050
             mo == 6 or
             mo == 9 or
-            mo == 11): x = -1; continue
+            mo == 11) and da > 30: x = -1; continue
                                                 # 1170  REM  Convert year string into numeric value
         yr = int(day)                           # 1180 YR =  VAL (DAY$)
         if yr < 0 or yr > 99: x = -1; continue  # 1190  IF YR < 0 OR YR > 99 THEN 1050: REM Only allow 0-99

scripts/tools/a2server-aliases.txt

@@ -2,17 +2,17 @@
 # vim: set tabstop=4 shiftwidth=4 expandtab filetype=sh:
 
 alias a2server-help="more /usr/local/etc/a2server-help.txt"
-alias a2server-setup="wget -q -O /tmp/a2server-setup ${A2SERVER_SCRIPT_URL}setup/index.txt || { echo \"Can't download A2SERVER setup scripts. Do you has internet?\"; false; } && source /tmp/a2server-setup"
+alias a2server-setup='wget -q -O /tmp/a2server-setup ${A2SERVER_SCRIPT_URL:-https://rawgit.com/RasppleII/a2server/current/}setup/index.txt || { echo "Can'"'"'t download A2SERVER setup scripts. Do you has internet?"; false; } && source /tmp/a2server-setup'
 
 alias a2server-version="cat /usr/local/etc/A2SERVER-version"
-alias a2server-update="wget -q -O /tmp/a2server-update ${A2SERVER_SCRIPT_URL}update/index.txt || { echo \"Can't download A2SERVER setup scripts. Do you has internet?\"; false; } && source /tmp/a2server-update"
+alias a2server-update='wget -q -O /tmp/a2server-update ${A2SERVER_SCRIPT_URL:-https://rawgit.com/RasppleII/a2server/current/}update/index.txt || { echo "Can'"'"'t download A2SERVER setup scripts. Do you has internet?"; false; } && source /tmp/a2server-update'
 
 alias system-shutdown='sudo shutdown -h now'
 alias system-restart='sudo shutdown -r now'
 
 
 alias raspi-config='[[ -f /usr/bin/raspi-config ]] && sudo /usr/bin/raspi-config || echo "raspi-config not found. Are you using a Raspberry Pi with Raspbian?"'
-alias raspbian-update='wget -qO /tmp/raspbian-update ${A2SERVER_SCRIPT_URL}scripts/raspbian-update.txt; source /tmp/raspbian-update'
+alias raspbian-update='wget -qO /tmp/raspbian-update ${A2SERVER_SCRIPT_URL:-https://rawgit.com/RasppleII/a2server/current/}scripts/raspbian-update.txt || { echo "Can'"'"'t download A2SERVER setup scripts. Do you has internet?"; false; } && source /tmp/raspbian-update'
 alias rasppleii-update='raspbian-update a2cloud a2server'
 
 alias welcome-message-edit='sudo nano /etc/motd'
@@ -25,7 +25,7 @@ alias ifreset='sudo rm /etc/udev/rules.d/70-persistent-net.rules; echo Interface
 
 alias netatalk-stop="sudo /etc/init.d/netatalk stop; bonjour-off"
 alias netatalk-start="sudo /etc/init.d/netatalk start; bonjour-on; grep -q 'ATALKD_RUN=yes' /etc/default/netatalk"
-alias netatalk-restart="sudo /etc/init.d/netatalk restart; bonjour-on;  grep -q 'ATALKD_RUN=yes' /etc/default/netatalk"
+alias netatalk-restart="sudo /etc/init.d/netatalk restart; bonjour-on; grep -q 'ATALKD_RUN=yes' /etc/default/netatalk"
 alias netatalk-off='sudo /etc/init.d/netatalk stop; bonjour-off; sudo update-rc.d -f netatalk remove &> /dev/null'
 alias netatalk-on='sudo update-rc.d netatalk defaults &> /dev/null; bonjour-on; sudo /etc/init.d/netatalk restart'
 
@@ -33,8 +33,8 @@ alias bonjour-off="sudo mv /etc/avahi/services/afpd.service /etc/avahi/services/
 alias bonjour-on="sudo mv /etc/avahi/services/afpd.service_disabled /etc/avahi/services/afpd.service &> /dev/null"
 
 
-alias netatalk-router-on='sudo sed -i '"'"'s/^eth0.*$/eth0 -router -phase 2 -net 1 -zone "A2SERVER"/'"'"' /usr/local/etc/netatalk/atalkd.conf; sudo sed -i '"'"'s/^wlan0.*$/wlan0 -router -phase 2 -net 1 -zone "A2SERVER"/'"'"' /usr/local/etc/netatalk/atalkd.conf; netatalk-restart'
-alias netatalk-router-off='sudo sed -i '"'"'s/^eth0.*$/eth0/'"'"' /usr/local/etc/netatalk/atalkd.conf; sudo sed -i '"'"'s/^wlan0.*$/wlan0/'"'"' /usr/local/etc/netatalk/atalkd.conf; netatalk-restart'
+alias netatalk-router-on='sudo sed -i '"'"'s/^\([^# ]*\)\( .*\)$/\1 -router\2 -zone "A2SERVER"/'"'"' /usr/local/etc/netatalk/atalkd.conf; netatalk-restart'
+alias netatalk-router-off='sudo sed -i '"'"'s/^\([^#].*\) -router\(.*\) -zone [^ ]*\(.*\)$/\1\2\3/'"'"' /usr/local/etc/netatalk/atalkd.conf; netatalk-restart'
 
 
 alias netatalk-eth='sudo sed -i 's/^wlan0/eth0/' /usr/local/etc/netatalk/atalkd.conf; netatalk-restart'
@@ -42,7 +42,7 @@ alias netatalk-wifi='sudo sed -i 's/^eth0/wlan0/' /usr/local/etc/netatalk/atalkd
 
 
 
-alias appletalk-off='sudo sed -i "s/ATALKD_RUN=yes/ATALKD_RUN=no/" /etc/default/netatalk; sudo killall macipgw > /dev/null; /etc/init.d/netatalk restart'
+alias appletalk-off='sudo sed -i "s/ATALKD_RUN=yes/ATALKD_RUN=no/" /etc/default/netatalk; sudo /etc/init.d/netatalk restart'
 alias appletalk-on='sudo sed -i "s/ATALKD_RUN=no/ATALKD_RUN=yes/" /etc/default/netatalk; sudo /etc/init.d/netatalk restart'
 
 

scripts/tools/a2serverrc.txt

@@ -1,6 +1,6 @@
 #! /bin/bash
 # vim: set tabstop=4 shiftwidth=4 expandtab filetype=sh:
 
-export A2SERVER_SCRIPT_URL="${A2SERVER_SCRIPT_URL:-http://ivanx.com/a2server/}"
+export A2SERVER_SCRIPT_URL="${A2SERVER_SCRIPT_URL:-https://rawgit.com/RasppleII/a2server/current/}"
 export A2SERVER_BINARY_URL="${A2SERVER_BINARY_URL:-http://ivanx.com/a2server/files/}"
 source /usr/local/etc/a2server-aliases

scripts/tools/cppo.txt

@@ -41,6 +41,7 @@ import shutil
 import errno
 import uuid
 import subprocess
+import tempfile
 
 # Intentionally fails on pre-2.6 (no b'') so user can see what's wrong
 b'ERROR: cppo requires Python 2.6 or later, including 3.x.'
@@ -59,8 +60,7 @@ g.activeFileName = None
 g.activeFileSize = None
 g.activeFileBytesCopied = 0
 g.resourceFork = 0
-g.shk_hasrf = ""
-g.shk_rfork = 0
+g.shk_hasrf = False
 
 g.PDOSPATH = []
 g.PDOSPATH_INDEX = 0
@@ -492,7 +492,7 @@ def processDir(arg1, arg2=None, arg3=None, arg4=None, arg5=None):
                     if (("/" + g.PDOSPATH_SEGMENT.lower()) !=
                                g.DIRPATH.lower()):
                         print("ProDOS volume name does not match disk image.")
-                        sys.exit(2)
+                        quitNow(2)
                     else:
                         g.PDOSPATH_INDEX += 1
                         g.PDOSPATH_SEGMENT = g.PDOSPATH[g.PDOSPATH_INDEX]
@@ -570,7 +570,8 @@ def processEntry(arg1, arg2):
             if (not g.extractFile or
                (os.path.basename(g.extractFile.lower()) ==
                 origFileName.split('#')[0].lower())):
-                print(dirPrint + g.activeFileName.split("#")[0] +
+                filePrint = g.activeFileName.split("#")[0]
+                print(dirPrint + filePrint +
                      ("+" if (g.shk_hasrf or
                              (not g.SHK and getStorageType(arg1, arg2) == 5))
                           else "") +
@@ -630,7 +631,7 @@ def processEntry(arg1, arg2):
                 if (g.PDOSPATH_SEGMENT or
                    (g.extractFile and
                    (g.extractFile.lower() == origFileName.lower()))):
-                    syncExit()
+                    quitNow(0)
                 g.targetName = None    
     #else:
         #print(g.activeFileName + " doesn't match " + g.PDOSPATH_SEGMENT)
@@ -742,17 +743,21 @@ def makeADfile():
     writecharsHex(g.exFileData, hexToDec("7A"), "0000000F000002AD00000004")
     # dbd (second time) will create DEV, INO, SYN, SV~
 
-def syncExit():
-    if (not g.nomsg and g.AD and os.path.isdir("/usr/local/etc/netatalk")):
+def quitNow(exitCode=0):
+    if (exitCode == 0 and not g.nomsg and
+        g.AD and os.path.isdir("/usr/local/etc/netatalk")):
         print("File(s) have been copied to the target directory. " +
               "If the directory")
         print("is shared by Netatalk, please type 'afpsync' now.")
-    # saveFile(g.imageFile, g.imageData)
-    sys.exit(0)
+    if g.SHK: # clean up
+        for file in os.listdir(tempfile.gettempdir()):
+            if file.startswith("cppo-"):
+                shutil.rmtree(tempfile.gettempdir() + "/" + file)
+    sys.exit(exitCode)
 
 def usage(exitcode=1):
     print(sys.modules[__name__].__doc__)
-    sys.exit(exitcode)
+    quitNow(exitcode)
 
 # --- ID bashbyter functions (adapted)
 
@@ -1149,7 +1154,7 @@ else:
 g.imageFile = args[1]
 if not os.path.isfile(g.imageFile):
     print("Image/archive file \"" + g.imageFile + "\" was not found.")
-    sys.exit(2)
+    quitNow(2)
 
 # automatically set ShrinkIt mode if extension suggests it
 if (g.SHK or
@@ -1158,7 +1163,7 @@ if (g.SHK or
     g.imageFile[-3:].lower() == "bxy"):
     if (os.name == "nt"):
         print("ShrinkIt archives cannot be extracted on Windows.")
-        sys.exit(2)
+        quitNow(2)
     else:
         try:
             with open(os.devnull, "w") as fnull:
@@ -1166,7 +1171,7 @@ if (g.SHK or
             g.SHK=1
         except Exception:
             print("Nulib2 is not available; not expanding ShrinkIt archive.")
-            sys.exit(2)
+            quitNow(2)
 
 if (len(args) == 4):
     g.extractFile = args[2]
@@ -1175,7 +1180,7 @@ if g.SHK:
     g.PNAME = 0
     if not g.CAT:
         targetDir = (args[3] if g.extractFile else args[2])
-    unshkdir = ("/tmp/cppo-" + str(uuid.uuid4()))
+    unshkdir = (tempfile.gettempdir() + "/cppo-" + str(uuid.uuid4()))
     makedirs(unshkdir)
     result = os.system("/bin/bash -c 'cd " + unshkdir + "; " +
                        "result=$(nulib2 -xse " + os.path.abspath(g.imageFile) +
@@ -1188,43 +1193,48 @@ if g.SHK:
         print(
           "File not found in ShrinkIt archive. Try cppo -cat to get the path,")
         print("  and omit any leading slash or colon.")
-        sys.exit(1)
+        quitNow(1)
     elif (result != 0):
         print("ShrinkIt archive is invalid, or some other problem happened.")
-        sys.exit(1)
+        quitNow(1)
     if g.extractFile:
         g.extractFile = g.extractFile.replace(':', '/')
         extractPath = (unshkdir + "/" + g.extractFile)
         extractPathDir = os.path.dirname(extractPath)
         # move the extracted file to the root
-        newunshkdir = ("/tmp/cppo-" + str(uuid.uuid4()))
+        newunshkdir = (tempfile.gettempdir() + "/cppo-" + str(uuid.uuid4()))
         makedirs(newunshkdir)
         for filename in os.listdir(extractPathDir):
             shutil.move(extractPathDir + "/" + filename, newunshkdir)
         shutil.rmtree(unshkdir)
         unshkdir = newunshkdir
 
-    fileNames = [name for name in os.listdir(unshkdir)
+    fileNames = [name for name in sorted(os.listdir(unshkdir))
                  if not name.startswith(".")]
-    if g.nodir:
-        oneDir = True # force extract in place
-    elif (len(fileNames) == 1 and os.path.isdir(unshkdir + "/" + fileNames[0])):
-        oneDir = True
+    if g.nodir: # extract in place from "-n"
+        curDir = True
+    elif (len(fileNames) == 1 and
+          os.path.isdir(unshkdir + "/" + fileNames[0])):
+        curDir = True # only one folder at top level, so extract in place
         volumeName = toProdosName(fileNames[0])
-    else:
-        oneDir = False
+    elif (len(fileNames) == 1 and    # disk image, so extract in place
+          fileNames[0][-1:] == "i"):
+        curDir = True
+        volumeName = toProdosName(fileNames[0].split("#")[0])
+    else: # extract in folder based on disk image name
+        curDir = False
         volumeName = toProdosName(os.path.basename(g.imageFile))
         if (volumeName[-4:].lower() == ".shk" or
             volumeName[-4:].lower() == ".sdk" or
             volumeName[-4:].lower() == ".bxy"):
             volumeName = volumeName[0:-4]
-    if not g.CAT and not g.nodir and not g.extractFile:
+    if not g.CAT and not curDir and not g.extractFile:
         print("Extracting into " + volumeName)
     # recursively process unshrunk archive hierarchy
     for dirName, subdirList, fileList in os.walk(unshkdir):
         subdirList.sort()
         if not g.CAT:
-            g.targetDir = (targetDir + ("" if oneDir else ("/" + volumeName)) +
+            g.targetDir = (targetDir + ("" if curDir else ("/" + volumeName)) +
                           ("/" if (dirName.count('/') > 2) else "") +
                           ("/".join(dirName.split('/')[3:]))) # chop tempdir
             if g.extractFile: # solo item, so don't put it in the tree
@@ -1236,17 +1246,26 @@ if g.SHK:
             if g.AD:
                 makedirs(g.ADdir)
         for fname in sorted(fileList):
-            g.shk_hasrf = ""
-            g.shk_rfork = False
+            if (fname[-1:] == "i"):
+                # disk image; rename to include suffix and correct type/auxtype
+                imagePath = os.path.join(dirName, fname).split("#")[0]
+                new_name = (imagePath +
+                           ("" if (imagePath.lower().endswith(".po") or
+                                   imagePath.lower().endswith(".hdv"))
+                               else ".PO") + "#e00005")
+                os.rename(os.path.join(dirName, fname), new_name)
+                fname = os.path.basename(new_name)
+            g.shk_hasrf = False
+            rfork = False
             if (fname[-1:] == "r" and
                 os.path.isfile(os.path.join(dirName, fname[:-1]))):
-                g.shk_rfork = True
+                rfork = True
             elif (os.path.isfile(os.path.join(dirName, (fname + "r")))):
-                g.shk_hasrf = "+"
-            if not g.shk_rfork:
+                g.shk_hasrf = True
+            if not rfork:
                 processEntry(dirName, fname)
     shutil.rmtree(unshkdir, True)
-    syncExit()
+    quitNow(0)
 
 # end script if SHK
             
@@ -1331,12 +1350,12 @@ if g.extractFile:
         g.targetName = targetPath.rsplit("/", 1)[1]
     if not os.path.isdir(g.targetDir):
         print("Target directory not found.")
-        sys.exit(2)
+        quitNow(2)
 else:
     if not g.CAT:
         if not os.path.isdir(args[2]):
             print("Target directory not found.")
-            sys.exit(2)
+            quitNow(2)
     
 if g.D33:
     diskName = os.path.basename(g.imageFile)
@@ -1359,7 +1378,7 @@ if g.D33:
                 readcharDec(g.imageData, ts(17,0)+2)])
     if g.extractFile:
         print("ProDOS file not found within image file.")
-    syncExit()
+    quitNow(0)
 
 # below: ProDOS
 
@@ -1382,7 +1401,7 @@ if g.extractFile:
         mkdir(g.ADdir)
     processDir(2)
     print("ProDOS file not found within image file.")
-    sys.exit(2)
+    quitNow(2)
 else:
     if not g.CAT:
         # print(args[0], args[1], args[2])
@@ -1394,5 +1413,5 @@ else:
             makedirs(g.ADdir)
     processDir(2)
     if not g.CAT:
-        syncExit()
+        quitNow(0)
 

setup/index.txt

@@ -9,12 +9,12 @@
 # to download and execute, type:
 # wget ivanx.com/a2server/setup; source setup
 
-a2serverVersion="130"
+a2serverVersion="150"
 
 # Ensure URL we'll use ends in a /
 case "$A2SERVER_SCRIPT_URL" in
 	*/) scriptURL="$A2SERVER_SCRIPT_URL" ;;
-	*) scriptURL="${A2SERVER_SCRIPT_URL:-http://ivanx.com/a2server}/" ;;
+	*) scriptURL="${A2SERVER_SCRIPT_URL:-https://rawgit.com/RasppleII/a2server/current}/" ;;
 esac
 case "$A2SERVER_BINARY_URL" in
 	*/) binaryURL="$A2SERVER_BINARY_URL" ;;
@@ -35,12 +35,13 @@ if [[ -f /usr/local/etc/A2SERVER-version ]]; then
 fi
 
 echo
-[[ $scriptURL != *"ivanx.com"* ]] && echo "Using script URL: $scriptURL"
+[[ $scriptURL != *"ivanx.com"* && $scriptURL != *"rawgit.com/RasppleII/a2server"* ]] && echo "Using script URL: $scriptURL"
 [[ $binaryURL != *"ivanx.com"* ]] && echo "Using binary URL: $binaryURL"
-[[ ! $useExternalURL ]] && echo -e "Not using external URLs. Payloads must be in:\n  ${binaryURL}external\n  (See A2SERVER developer page for more information.)"
+[[ ! $useExternalURL ]] && echo -e "Not using external URLs. Downloads must be available from:\n  ${binaryURL}external/appleii/\n  ${binaryURL}external/source/\n  (See the A2SERVER developer page for more information.)"
 
 skipRepoUpdate=
 autoAnswerYes=
+installAll=
 setupNetBoot=
 setupWindowsSharing=
 compileAlways=
@@ -51,6 +52,9 @@ while [[ $1 ]]; do
         shift
         skipRepoUpdate="-r"
         touch /tmp/a2server-packageReposUpdated
+    elif [[ $1 == "-i" ]]; then
+        shift
+        installAll="-i"
     elif [[ $1 == "-y" ]]; then
         shift
         autoAnswerYes="-y"
@@ -81,6 +85,7 @@ while [[ $1 ]]; do
     elif [[ $1 ]]; then
         echo "options:"
         echo "-v: display installed and available versions, then exit"
+        echo "-i: reinstall A2SERVER software (but not Apple II software)"
         echo "-y: auto-answer yes to all prompts"
         echo "-r: don't update package repositories"
         echo "-b: auto-setup network boot (use with -y)"
@@ -111,6 +116,10 @@ fi
 a2server_update=0
 doSetup=1
 
+if { [[ -f /usr/local/etc/A2SERVER-version ]] && (( $(head -c 3 /usr/local/etc/A2SERVER-version) < 150 )); }; then
+    a2server_update=1
+fi
+
 unsupportedOS=1
 if [[ $isRpi ]]; then #supported Raspbian? (16-Feb-15, 20-Jun-14, 09-Jan-14, etc)
     fwhash=$(zcat /usr/share/doc/raspberrypi-bootloader/changelog.Debian.gz | grep -m 1 'as of' | awk '{print $NF}')
@@ -142,13 +151,12 @@ if [[ $unsupportedOS ]]; then
     echo
     echo "WARNING: A2SERVER and its installer scripts have only been tested on"
     echo "Debian and Raspbian. Continuing is probably fine, but might not be."
-    echo "Worst case could make your operating system no longer work properly,"
-    echo "or cause data to be lost."
-    echo "More information is at http://ivanx.com/a2server."
+    echo "Theoretical worst case would be your operating system no longer works"
+    echo "properly or data is lost, so consider backing up first."
 fi
 
 doSetup=1
-if [[ ! -f /usr/local/etc/a2server-help.txt ]] || (( $a2server_update )); then
+if [[ $installAll || ! -f /usr/local/etc/a2server-help.txt ]] || (( $a2server_update )); then
     echo
     echo "Setting up A2SERVER will take up to 60 minutes, during which"
     echo "you'll see a bunch of stuff spit out across the screen."
@@ -229,6 +237,16 @@ if (( $doSetup )); then
 
         echo "A2SERVER: Scripts have been downloaded. Installing..."
 
+        if [[ $installAll ]]; then
+            sudo rm /usr/local/etc/A2SERVER-version 2> /dev/null
+            sudo rm /usr/local/bin/nulib2 2> /dev/null
+            sudo rm /usr/local/bin/unar 2> /dev/null
+            sudo rm /usr/local/sbin/macipgw 2> /dev/null
+            sudo rm /usr/local/bin/ciopfs 2> /dev/null
+            sudo rm /usr/local/etc/netatalk/afppasswd 2> /dev/null
+            sudo rm /usr/local/etc/netatalk/a2boot/p8 /usr/local/etc/netatalk/a2boot/ProDOS16\ Image 2> /dev/null
+        fi
+
         /tmp/1.storage
         rm /tmp/1.storage
         /tmp/2.tools

update/devhistory.txt

@@ -0,0 +1,97 @@
+1.0.0: Jan 2012: initial release
+
+1.0.1: Jan 2012: fixes Netatalk date-stamp bug (thanks to Steven Hirsch)
+
+1.0.2: Jan 2013: Netatalk 2.2.4; OS X 10.7+ login fixed; netboot fixes;
+                 Raspbian "Wheezy" support; Ubuntu 12.04 LTS support
+
+1.1.0: Apr 2013: Full GS/OS install; eliminated GS.SYSTEM volume;
+                 Raspberry Pi enhancements; lots of improvements to installer;
+                 more utilities installed for Apple II; improved cppo
+                 NOTE: fresh install required, can't update earlier version
+
+1.1.1: Jun 2013: Wi-Fi support; updates/additions to commands in a2server-help;
+                 bug fixes and improvements to install script; appletalk kernel
+                 module for Raspbian (instead of replacement kernel); RPi
+                 console (onboard serial) set to 19,200 bps during boot
+
+1.1.2: Oct 2013: resolves issue of no AppleTalk in Raspbian 2013-09-10 and
+                 later; faster command-line installation on Raspberry Pi
+                 (nulib2 and unar binaries are downloaded rather than compiled)
+
+1.1.3: Jan 2014: shares ADTPro disks folder as ADTDISKS; added environment
+                 variables for shared folders; can resolve by name
+                 "a2server.local" if network client has Bonjour/zeroconf;
+                 server presents itself as Shared computer to Macs on network;
+                 VM based on Debian 7
+
+1.1.4: Jan 2014: fixes bug with network boot if ADTPro disks folder is shared
+
+1.1.5: Jul 2014: a2server-setup fixes Raspbian 20-Jul-14 AppleTalk kernel panic
+
+1.2.0: Aug 2014: a2server-setup and Netatalk startup script addresses AppleTalk
+                 kernel panic on any Linux kernel 3.12-3.15; Netatalk starts
+                 in background, preventing startup delay; a2server-setup always
+                 configures Netatalk startup script and can download a new one
+                 if missing; a2server-setup on Raspbian or Debian 7 x86 is
+                 faster because it downloads binaries rather than compiling
+                 from source; unbit/unexec/usq unarchivers added; additional
+                 virtual machine which has both A2SERVER and A2CLOUD installed
+
+1.2.1: Jan 2015: minor fixes; support for LED blink on Raspbian 2015-01-31
+
+1.2.2: Mar 2015: installer improvements: now has command line options,
+                 including unattended install; installer sets passwords
+                 automatically to 'apple2'; status messages are now prefixed by
+                 A2SERVER:; can update Raspple II (Raspbian OS,
+                 NOOBS install manager, A2SERVER, and A2CLOUD); minor fixes.
+
+1.2.3: May 2015: changed Apple software links to Internet Archive
+
+1.2.4: Jul 2015: offer to download A2CLOUD disk contents onto A2FILES volume
+
+1.2.4+:Oct 2015: support for using A2SERVER scripts from a location other than
+[unannounced]    ivanx.com/a2server for development purposes
+
+1.2.5: Nov 2015: netboot install option for GS/OS 6.0.2/3
+                 netboot always downloads GS/OS disk images even if present
+                 provides error if a2setup doesn't have internet
+                 remove persisting a2server-setup options after aborted install
+                 fixed installer bug that omits first and last script elements
+                 download images from Apple, with Internet Archive as a backup
+                 install HFS.FST during netboot install
+
+1.2.5+:Nov 2015: Merged Ivan's 1.2.5 release, removed support for Ubuntu for
+[unannounced]    now (see RasppleII/a2server#11), patched ProDOS 8 in boot
+                 files for current year table, install unar from a package if
+                 it exists.
+
+1.2.6: Nov 2015: full, ready to use install of Spectrum; install unzip
+[unannounced]
+                 
+1.2.6+:Nov 2015: merged Ivan's 1.2.6 (into github master branch)
+[unannounced]
+
+1.2.7: Dec 2015: preliminary Jessie support; case insensitive file system for
+[unannounced]    A2FILES; removes GSFILES if empty; DOS3.3.FST and TEACH are
+                 installed with netboot installation; minor bug fixes and
+                 tweaks; Ubuntu support removed; branches unified
+
+1.2.8: Dec 2015: can specify alternate host for binaries and external files;
+[unannounced]    64-bit Debian precompiled binaries; move /media/A2SHARED/*
+                 to /srv/A2SERVER; internet access (MacIP support);
+                 
+1.2.9: Jan 2016: cppo supports ShrinkIt, DOS 3.3, DSK, 2MG; MountIt fully
+[unannounced]    installed; nulib2 fixes handling empty forks (thanks Andy);
+                 -c installer option compiles all software (no binaries)
+                 
+1.3.0: Jan 2016: Marinetti 3.0b8 installed, with preconfigured MacIP
+[unannounced]
+
+1.3.1: Jan 2016: patch Prodos 8 Thunderclock year table based on current date
+[unannounced]
+
+1.3.2: Jan 2016: install SAFE2, SAM2, and SNAP, configured for Apple II sites;
+[unannounced]    -i installer option reinstalls A2SERVER
+                 
+1.5.0: Jan 2016: defaults to GitHub for location of installer scripts

update/index.txt

@@ -4,7 +4,7 @@
 # Ensure URL we'll use ends in a /
 case "$A2SERVER_SCRIPT_URL" in
 	*/) scriptURL="$A2SERVER_SCRIPT_URL" ;;
-	*) scriptURL="${A2SERVER_SCRIPT_URL:-http://ivanx.com/a2server}/" ;;
+	*) scriptURL="${A2SERVER_SCRIPT_URL:-https://rawgit.com/RasppleII/a2server/current}/" ;;
 esac
 
 currentVersion=$(wget -qO- "${scriptURL}setup/index.txt" | grep '^a2serverVersion' | cut -d '"' -f 2)
@@ -37,9 +37,8 @@ else
     read
 fi
 if [[ ${REPLY:0:1} == "y" || ${REPLY:0:1} == "Y" ]]; then
-    sudo rm /usr/local/etc/A2SERVER-version &> /dev/null
     # sudo rm /usr/local/etc/netatalk/a2boot/* &> /dev/null
-    wget -q -O /tmp/setup "${scriptURL}setup/index.txt"; source /tmp/setup "$@"
+    wget -q -O /tmp/setup "${scriptURL}setup/index.txt"; source /tmp/setup -i "$@"
 fi
 
 unset currentVersion 2> /dev/null

update/versionhistory.txt

@@ -48,44 +48,29 @@
 
 1.2.3: May 2015: changed Apple software links to Internet Archive
 
-1.2.4: Jul 2015: offer to download A2CLOUD disk contents onto A2FILES volume
+1.2.4: Jul 2015: install option for ProTERM, Z.Link, ADTPro, Spectrum images
 
-1.2.4+:Oct 2015: support for using A2SERVER scripts from a location other than
-                 ivanx.com/a2server for development purposes
-                 [not released]
+1.2.5: Nov 2015: netboot install option for GS/OS 6.0.2/3; install HFS.FST
+                 during netboot install
 
-1.2.5: Nov 2015: netboot install option for GS/OS 6.0.2/3
-                 netboot always downloads GS/OS disk images even if present
-                 provides error if a2setup doesn't have internet
-                 remove persisting a2server-setup options after aborted install
-                 fixed installer bug that omits first and last script elements
-                 download images from Apple, with Internet Archive as a backup
-                 install HFS.FST during netboot install
+1.2.6: Nov 2015: full, ready to use install of Spectrum
+                 [unannounced; released briefly, then withdrawn]
 
-1.2.5+:Nov 2015: Merged Ivan's 1.2.5 release, removed support for Ubuntu for
-                 now (see RasppleII/a2server#11), patched ProDOS 8 in boot
-                 files for current year table, install unar from a package if
-                 it exists.
-                 [not released]
+1.5.0: Jan 2016: mixed case filenames for A2FILES; remove GSFILES if empty; 
+                 install Marinetti 3.0b8 with internet access via MacIP;
+                 fully install Spectrum, SAFE2, SAM2, SNAP, MountIt; install
+                 DOS3.3 and TEACH; remove Ubuntu support; move/media/A2SHARED/*
+                 to /srv/A2SERVER; faster install (precompiled binaries) on
+                 64-bit Debian; cppo supports ShrinkIt, DOS 3.3, DSK, 2MG,mixed
+                 case filenames; nulib2 handles empty forks (thanks Andy);
+                 new installer options; patch P8 Thunderclock driver year table
+                 for current date; install from any host URL for development;
+                 source code at GitHub (thanks Joseph)
 
-1.2.6: Nov 2015: full, ready to use install of Spectrum; install unzip
-                 [released briefly, then withdrawn]
-                 
-1.2.6+:Nov 2015: merged Ivan's 1.2.6
-                 [not released]
-
-1.2.7: Dec 2015: codebase unified; preliminary Jessie support; case insensitive
-                 file system for A2FILES; removes GSFILES if empty; DOS3.3.FST
-                 and TEACH are installed with netboot installation; minor bug
-                 fixes and tweaks
-                 [not released]
-
-1.2.8: Dec 2015: moved /media/A2SHARED to /srv/A2SERVER
-                 macipgw installed
-                 files subdirectory reorganized
-                 64-bit Debian binaries
-                 A2SERVER_SCRIPT_URL now works everywhere
-                 A2SERVER_BINARY_URL can now be specified
-                 self-hosted binaries fallback, or preferred with A2SERVER_NO_EXTERNAL
-                 better information at start and end of install
-                 [not released]
+Big thanks to: Anthony Martino, Henry Courbis, Joseph Carter, Jason King,
+Andy McFadden, Steven Hirsch, Geoff Body, Peter Wong, Tony Diaz, David Schmidt,
+David Schmenk, Ewen Wannop, Andrew Roughan, Antoine Vignau, Martin Haye,
+Ken Gagne, Peter Neubauer, James Littlejohn, Ninjaforce; the creators of
+Netatalk, The Unarchiver, ciopfs, macipgw; and the entire Apple II community.
+Redistribution of Spectrum, SAFE2, SAM2, SNAP by permission of Ewen Wannop.
+Thanks for using A2SERVER!