Extend the inversion of downloadBinaries

We don't actually download any picopkg files in install_comm_tools
anymore—oysttyer was the only one and we just always pull that from git
and the Readline module from CPAN now.  (In buster we'll only need the
CPAN module if Debian doesn't package it.)

Really the only picopkgs which are optional to download are gsport,
linapple, and nulib.  And since none of those exist at the moment, you
don't even really have much of an "option" about them either.  Yeah, I
know, I'm working on it.

scripts/install_archive_tools

@@ -30,7 +30,7 @@ install_nulib2() {
 
 		local nulibWork="$(mktemp -d /tmp/nulib.XXXXXXXXXXXX)"
 		pushd "$nulibWork" >/dev/null
-		if [[ $downloadBinaries ]]; then
+		if [[ ! $noPicoPkg ]]; then
 			### ArchiveTools: Install nulib2 binaries
 			wget -q "${a2cBinaryURL}/picopkg/nulib2-${ras2_os}_${ras2_arch}.tgz"
 			if [[ -f "nulib2-${ras2_os}_${ras2_arch}.tgz" ]]; then
@@ -132,9 +132,9 @@ install_unar() {
 }
 
 
-downloadBinaries=1
+noPicoPkg=
 if [[ $1 == -c ]]; then
-	downloadBinaries=
+	noPicoPkg=1
 fi
 install_nulib2
 install_sciibin

scripts/install_comm_tools

@@ -216,10 +216,6 @@ install_oysttyer() {
 	rm -rf "$oysttyerWork"
 }
 
-downloadBinaries=1
-if [[ $1 == -c ]]; then
-	downloadBinaries=
-fi
 install_curl
 install_lrzsz
 install_ftp

setup/ivan.sh

@@ -92,7 +92,7 @@ while [[ $1 ]]; do
 		echo "-s: prompt for restart after installation"
 		echo "-6: put blank 140K disk images in GSport slot 6"
 		echo "-b: build A2CLOUD disks, rather than downloading premade images"
-		echo "-c: compile non-package items, rather than downloading binaries"
+		echo "-c: compile non-package items, rather than downloading picopkg files"
 		[[ $0 == "-bash" ]] && return 1 || exit 1
 	fi
 done
@@ -719,7 +719,7 @@ fi
 
 # Install Comm Tools
 # FIXME: Interim refactoring
-. "$a2cSource/scripts/install_comm_tools" ${noPicoPkg:+-c}
+. "$a2cSource/scripts/install_comm_tools"
 
 if [[ $installEmulators ]]; then