get Spectrum/SAFE/SAM/SNAP URL's from dist page; display version numbers

bump version to 1.3.2

scripts/a2server-2-tools.txt

@@ -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-5-netboot.txt

@@ -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"
@@ -173,15 +169,27 @@ 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 ]]; 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 +197,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 +224,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'
@@ -278,6 +289,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 +314,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 +323,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 +360,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 +379,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 +473,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..."    
@@ -495,99 +513,113 @@ if [[ ! $autoAnswerYes || -f /tmp/a2server-setupNetBoot ]]; then
         echo
         echo "A2SERVER: Updating ProDOS 8 Thunderclock driver year tables..."
         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://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
+                    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
+                        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
@@ -601,13 +633,13 @@ if [[ ! $autoAnswerYes || -f /tmp/a2server-setupNetBoot ]]; then
                 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
+                    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
         
@@ -659,12 +691,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 && $commDir/SNAP/SNAP && $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 +720,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)
+                    samUrl=$(echo "$html" | grep -i 'sam2.*bxy' | tr '<>' '\n' | grep href | cut -d '=' -f 2)
+                    snapUrl=$(echo "$html" | grep -i 'snap.*bxy' | tr '<>' '\n' | grep href | cut -d '=' -f 2)
+                    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 +764,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 +775,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 +788,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
 
@@ -779,41 +840,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- ${scriptURL}files/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- ${scriptURL}files/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 +1014,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/tools/a2server-aliases.txt

@@ -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/cppo.txt

@@ -59,8 +59,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 +491,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 +569,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 +630,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 +742,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("/tmp"):
+            if file.startswith("cppo-"):
+                shutil.rmtree(file)
+    sys.exit(exitCode)
 
 def usage(exitcode=1):
     print(sys.modules[__name__].__doc__)
-    sys.exit(exitcode)
+    quitNow(exitcode)
 
 # --- ID bashbyter functions (adapted)
 
@@ -1149,7 +1153,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 +1162,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 +1170,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]
@@ -1188,10 +1192,10 @@ 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)
@@ -1204,27 +1208,32 @@ if g.SHK:
         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 +1245,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 +1349,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 +1377,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 +1400,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 +1412,5 @@ else:
             makedirs(g.ADdir)
     processDir(2)
     if not g.CAT:
-        syncExit()
+        quitNow(0)
 

setup/index.txt

@@ -9,7 +9,7 @@
 # to download and execute, type:
 # wget ivanx.com/a2server/setup; source setup
 
-a2serverVersion="130"
+a2serverVersion="132"
 
 # Ensure URL we'll use ends in a /
 case "$A2SERVER_SCRIPT_URL" in
@@ -37,10 +37,11 @@ fi
 echo
 [[ $scriptURL != *"ivanx.com"* ]] && 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)"
@@ -229,6 +234,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