From af9ebdc4dadecedefa601a7f88c9bf00327f7d89 Mon Sep 17 00:00:00 2001 From: "T. Joseph Carter" Date: Wed, 7 Dec 2016 04:08:39 -0800 Subject: [PATCH] Quote URLs passed to wget --- scripts/a2server-2-tools.txt | 4 +- scripts/a2server-3-sharing.txt | 12 +++--- scripts/a2server-5-netboot.txt | 74 +++++++++++++++++----------------- setup/index.txt | 3 -- 4 files changed, 45 insertions(+), 48 deletions(-) diff --git a/scripts/a2server-2-tools.txt b/scripts/a2server-2-tools.txt index ae34920..154eef7 100755 --- a/scripts/a2server-2-tools.txt +++ b/scripts/a2server-2-tools.txt @@ -146,11 +146,11 @@ if ! hash unar &> /dev/null; then mkdir /tmp/unar cd /tmp/unar if [[ $useExternalURL ]]; then - wget -O unar-1.8.1.zip https://github.com/incbee/Unarchiver/archive/unar-1.8.1.zip + wget -O unar-1.8.1.zip "https://github.com/incbee/Unarchiver/archive/unar-1.8.1.zip" unzip -o unar-1.8.1.zip &> /dev/null fi if [ ! -d *Unarchiver*/XADMaster ]; then # need single bracket for glob - wget -O unar-1.8.1.zip ${binaryURL}external/source/unar-1.8.1.zip + wget -O unar-1.8.1.zip "${binaryURL}external/source/unar-1.8.1.zip" unzip -o unar-1.8.1.zip &> /dev/null fi cd *Unarchiver*/XADMaster diff --git a/scripts/a2server-3-sharing.txt b/scripts/a2server-3-sharing.txt index 93ae344..ff9fd2c 100755 --- a/scripts/a2server-3-sharing.txt +++ b/scripts/a2server-3-sharing.txt @@ -208,7 +208,7 @@ echo "A2SERVER: Configuring Netatalk..." # if missing Netatalk startup file, download a fresh one if [ ! -f /etc/init.d/netatalk ]; then echo "A2SERVER: Downloading new Netatalk startup script..." - sudo wget -qO /etc/init.d/netatalk ${binaryURL}netatalk-init.d-clean.txt + sudo wget -qO /etc/init.d/netatalk "${binaryURL}netatalk-init.d-clean.txt" fi # make the Netatalk startup script work correctly @@ -317,7 +317,7 @@ if [[ -d /srv/A2SERVER/A2FILES && ! -d /srv/A2SERVER/.a2files ]]; then fi rm /srv/A2SERVER/A2FILES/.APPLEDESKTOP 2> /dev/null mkdir -p /tmp/netboot - wget -qO /tmp/A2FILES-list.txt ${binaryURL}A2FILES-list.txt + wget -qO /tmp/A2FILES-list.txt "${binaryURL}A2FILES-list.txt" find /srv/A2SERVER/A2FILES -name '*' | tail -n +2 | tac > /tmp/filelist.txt while read thisFile; do mixedCase="${thisFile##*/}" @@ -394,11 +394,11 @@ if ! hash ciopfs &> /dev/null; then mkdir /tmp/ciopfs cd /tmp/ciopfs if [[ $useExternalURL ]]; then - wget -q -O ciopfs-0.4.tar.gz http://www.brain-dump.org/projects/ciopfs/ciopfs-0.4.tar.gz + wget -q -O ciopfs-0.4.tar.gz "http://www.brain-dump.org/projects/ciopfs/ciopfs-0.4.tar.gz" tar zxf ciopfs-0.4.tar.gz &> /dev/null fi if [ ! -f ciopfs*/ciopfs.c ]; then # single brackets required for glob - wget -q -O ciopfs-0.4.tar.gz ${binaryURL}external/source/ciopfs-0.4.tar.gz + wget -q -O ciopfs-0.4.tar.gz "${binaryURL}external/source/ciopfs-0.4.tar.gz" tar zxf ciopfs-0.4.tar.gz &> /dev/null fi cd ciopfs* @@ -505,7 +505,7 @@ if [[ -f "/lib/modules/$kernelRelease/kernel/drivers/net/appletalk/ipddp.ko" ]]; if [[ ${arch%_*} == "debian" ]]; then echo "A2SERVER: Fetching AppleTalk kernel module for Debian..." - wget -qO /tmp/appletalk.tgz ${binaryURL}precompiled/appletalk-$kernelRelease-${arch}.tgz + 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 sudo tar Pxf /tmp/appletalk.tgz &> /dev/null @@ -617,7 +617,7 @@ if [[ ( ! $(pgrep atalkd) ) && $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: Installing AppleTalk kernel module for Raspbian..." - wget -qO /tmp/appletalk.ko.gz ${binaryURL}appletalk-$kernelRelease-rpi.ko.gz + 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 gunzip -f /tmp/appletalk.ko.gz &> /dev/null diff --git a/scripts/a2server-5-netboot.txt b/scripts/a2server-5-netboot.txt index 3b187c7..f7b4434 100755 --- a/scripts/a2server-5-netboot.txt +++ b/scripts/a2server-5-netboot.txt @@ -224,15 +224,15 @@ if [[ ! $autoAnswerYes || -f /tmp/a2server-setupNetBoot ]]; then cd /tmp/netboot if [[ $useExternalURL ]]; then - wget --max-redirect 0 -qO Disk_7_of_7-Apple_II_Setup.sea.bin ${gsosURL}Disk_7_of_7-Apple_II_Setup.sea.bin + wget --max-redirect 0 -qO Disk_7_of_7-Apple_II_Setup.sea.bin "${gsosURL}Disk_7_of_7-Apple_II_Setup.sea.bin" unar -k skip Disk_7_of_7-Apple_II_Setup.sea.bin &> /dev/null if (( $? != 0 )); then - wget -qO Disk_7_of_7-Apple_II_Setup.sea.bin ${gsosBackupURL}Disk_7_of_7-Apple_II_Setup.sea.bin + wget -qO Disk_7_of_7-Apple_II_Setup.sea.bin "${gsosBackupURL}Disk_7_of_7-Apple_II_Setup.sea.bin" unar -k skip Disk_7_of_7-Apple_II_Setup.sea.bin &> /dev/null fi fi if [[ ! -f 'Disk 7 of 7-Apple II Setup.sea' ]]; then - wget -qO Disk_7_of_7-Apple_II_Setup.sea.bin ${binaryURL}external/appleii/gsos601/Disk_7_of_7-Apple_II_Setup.sea.bin + wget -qO Disk_7_of_7-Apple_II_Setup.sea.bin "${binaryURL}external/appleii/gsos601/Disk_7_of_7-Apple_II_Setup.sea.bin" unar -k skip Disk_7_of_7-Apple_II_Setup.sea.bin &> /dev/null fi truncate -s 819284 'Disk 7 of 7-Apple II Setup.sea' @@ -597,11 +597,11 @@ if [[ ! $autoAnswerYes || -f /tmp/a2server-setupNetBoot ]]; then echo cd /tmp/netboot if [[ $useExternalURL ]]; then - wget -qO Asimov.shk http://www.ninjaforce.com/downloads/Asimov.shk + 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 + wget -qO Asimov.shk "${binaryURL}external/appleii/Asimov.shk" nulib2 -x -s Asimov.shk &> /dev/null fi cp -p Asimov/Asimov $imageToolsDir/Asimov @@ -619,14 +619,14 @@ if [[ ! $autoAnswerYes || -f /tmp/a2server-setupNetBoot ]]; then mkdir -p /tmp/netboot/gshk cd /tmp/netboot/gshk if [[ $useExternalURL ]]; then - wget -qO gshk11.sea http://www.nulib.com/library/gshk11.sea + 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 + 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 + wget -qO gshk11.sea "${binaryURL}external/appleii/gshk11.sea" nulib2 -x -s gshk11.sea &> /dev/null fi cp -p GSHK $imageToolsDir/GSHK @@ -645,15 +645,15 @@ if [[ ! $autoAnswerYes || -f /tmp/a2server-setupNetBoot ]]; then 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 + 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 + 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 + 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 @@ -678,14 +678,14 @@ if [[ ! $autoAnswerYes || -f /tmp/a2server-setupNetBoot ]]; then echo cd /tmp/netboot if [[ $useExternalURL ]]; then - wget -qO shrinkit.sdk http://www.nulib.com/library/shrinkit.sdk + 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 + 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#000118i" ]]; then - wget -qO shrinkit.sdk ${binaryURL}external/appleii/shrinkit.sdk + wget -qO shrinkit.sdk "${binaryURL}external/appleii/shrinkit.sdk" nulib2 -x -s -e shrinkit.sdk &> /dev/null fi cppo -s -ad "SHRINKIT#000118i" /SHRINKIT/SHRINKIT $diskToolsP8Dir &> /dev/null @@ -700,11 +700,11 @@ if [[ ! $autoAnswerYes || -f /tmp/a2server-setupNetBoot ]]; then echo cd /tmp/netboot if [[ $useExternalURL ]]; then - wget -q -O dsk2file.shk http://www.dwheeler.com/6502/oneelkruns/dsk2file.zip + wget -q -O dsk2file.shk "http://www.dwheeler.com/6502/oneelkruns/dsk2file.zip" nulib2 -x -s dsk2file.shk &> /dev/null fi if [[ ! -f DSK2FILE58 ]]; then - wget -qO dsk2file.shk ${binaryURL}external/appleii/dsk2file.shk + wget -qO dsk2file.shk "${binaryURL}external/appleii/dsk2file.shk" nulib2 -x -s dsk2file.shk &> /dev/null fi cp -p DSK2FILE58 $diskToolsP8Dir/DSK2FILE @@ -719,14 +719,14 @@ if [[ ! $autoAnswerYes || -f /tmp/a2server-setupNetBoot ]]; then echo cd /tmp/netboot if [[ $useExternalURL ]]; 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 + 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 + 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" 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 + wget -qO Apple_II_System_Disk_3.2.sea.bin "${binaryURL}external/appleii/Apple_II_System_Disk_3.2.sea.bin" unar -k skip Apple_II_System_Disk_3.2.sea.bin &> /dev/null fi truncate -s 819284 'Apple II System Disk 3.2.sea' @@ -785,7 +785,7 @@ if [[ ! $autoAnswerYes || -f /tmp/a2server-setupNetBoot ]]; then 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) + 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 '"') @@ -809,11 +809,11 @@ if [[ ! $autoAnswerYes || -f /tmp/a2server-setupNetBoot ]]; then 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 + wget -qO spectrum_gold_2mg.zip "http://www.speccie.co.uk/speccie/software/spectrum_gold_2mg.zip" unzip spectrum_gold_2mg.zip Spectrum.Gold.2mg &> /dev/null fi 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 + wget -qO spectrum_gold_2mg.zip "${binaryURL}external/appleii/spectrum_gold_2mg.zip" unzip spectrum_gold_2mg.zip Spectrum.Gold.2mg &> /dev/null fi cppo -s -ad Spectrum.Gold.2mg . &> /dev/null @@ -851,25 +851,25 @@ if [[ ! $autoAnswerYes || -f /tmp/a2server-setupNetBoot ]]; then cd /tmp/netboot/marinetti # Marinetti 3.0b1 -- had to repackage because installer is GS/OS self-contained app - wget -qO MarinettiB1.SHK ${binaryURL}appleii/MarinettiB1.SHK + wget -qO MarinettiB1.SHK "${binaryURL}appleii/MarinettiB1.SHK" cppo -ad -s -n MarinettiB1.SHK $gsosDir > /dev/null # TCP/IP update (3.0b8) if [[ $useExternalURL ]]; then - wget -qO Marinetti3.0b8.po http://www.a2retrosystems.com/downloads/Marinetti3.0b8.po + wget -qO Marinetti3.0b8.po "http://www.a2retrosystems.com/downloads/Marinetti3.0b8.po" fi if [[ $? != 0 || ! -f Marinetti3.0b8.po || $(wc -c < Marinetti3.0b8.po) != "819200" ]]; then - wget -qO Marinetti3.0b8.po ${binaryURL}external/appleii/Marinetti3.0b8.po + wget -qO Marinetti3.0b8.po "${binaryURL}external/appleii/Marinetti3.0b8.po" fi cppo -ad Marinetti3.0b8.po /MARINETTI3.0B8/TCPIP $gsosDir/System/System.Setup > /dev/null cppo -ad Marinetti3.0b8.po /MARINETTI3.0B8/CHANGELOG.3.0B8 $commDir/Marinetti > /dev/null # PPP Scripted Link Layer update (1.3d4) if [[ $useExternalURL ]]; then - wget -qO PPPX.1.3d4.SHK http://www.apple2.org/marinetti/PPPX.1.3d4.SHK + wget -qO PPPX.1.3d4.SHK "http://www.apple2.org/marinetti/PPPX.1.3d4.SHK" fi if [[ $? != 0 || ! -f PPPX.1.3d4.SHK || $(wc -c < PPPX.1.3d4.SHK) != "22068" ]]; then - wget -qO PPPX.1.3d4.SHK ${binaryURL}external/appleii/PPPX.1.3d4.SHK + wget -qO PPPX.1.3d4.SHK "${binaryURL}external/appleii/PPPX.1.3d4.SHK" fi cppo -ad -s PPPX.1.3d4.SHK . > /dev/null cd PPPX.1.3d4 @@ -881,24 +881,24 @@ if [[ ! $autoAnswerYes || -f /tmp/a2server-setupNetBoot ]]; then # Uthernet Link Layer if [[ $useExternalURL ]]; then - wget -qO uthernetll.bxy http://www.speccie.co.uk/speccie/software/uthernetll.bxy + wget -qO uthernetll.bxy "http://www.speccie.co.uk/speccie/software/uthernetll.bxy" fi if [[ $? != 0 || ! -f uthernetll.bxy || $(wc -c < uthernetll.bxy) -eq 0 ]]; then - wget -qO uthernetll.bxy ${binaryURL}external/appleii/uthernetll.bxy + wget -qO uthernetll.bxy "${binaryURL}external/appleii/uthernetll.bxy" fi cppo -ad -s -n uthernetll.bxy $gsosDir/System/TCPIP > /dev/null # Uthernet II Link Layer if [[ $useExternalURL ]]; then - wget -qO uthernet2ll.bxy http://www.speccie.co.uk/speccie/software/uthernet2ll.bxy + wget -qO uthernet2ll.bxy "http://www.speccie.co.uk/speccie/software/uthernet2ll.bxy" fi if [[ $? != 0 || ! -f uthernet2ll.bxy || $(wc -c < uthernet2ll.bxy) -eq 0 ]]; then - wget -qO uthernet2ll.bxy ${binaryURL}external/appleii/uthernet2ll.bxy + wget -qO uthernet2ll.bxy "${binaryURL}external/appleii/uthernet2ll.bxy" fi cppo -ad -s -n uthernet2ll.bxy $gsosDir/System/TCPIP > /dev/null # MacIP Link Layer settings for A2SERVER - wget -qO- ${binaryURL}macip-prefs.tgz | tar Pxz + wget -qO- "${binaryURL}macip-prefs.tgz" | tar Pxz afpsync -v $gsosDir > /dev/null fi @@ -919,7 +919,7 @@ if [[ ! $autoAnswerYes || -f /tmp/a2server-setupNetBoot ]]; then cppo -s -ad safe2.bxy . &> /dev/null fi if [[ ! -f SAFE2.Archive/Safe2 ]]; then - wget -qO safe2.bxy ${binaryURL}external/appleii/safe2.bxy + wget -qO safe2.bxy "${binaryURL}external/appleii/safe2.bxy" cppo -s -ad safe2.bxy . &> /dev/null fi cd SAFE2.Archive @@ -933,7 +933,7 @@ if [[ ! $autoAnswerYes || -f /tmp/a2server-setupNetBoot ]]; then 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 + wget -qO- "${binaryURL}safe2-setup.tgz" | tar Pzx afpsync -v $gsosDir > /dev/null fi @@ -955,7 +955,7 @@ if [[ ! $autoAnswerYes || -f /tmp/a2server-setupNetBoot ]]; then cppo -s -ad sam2.bxy . &> /dev/null fi if [[ ! -f SAM2.Archive/SAM2/SAM2 ]]; then - wget -qO sam2.bxy ${binaryURL}external/appleii/sam2.bxy + wget -qO sam2.bxy "${binaryURL}external/appleii/sam2.bxy" cppo -s -ad sam2.bxy . &> /dev/null fi cd SAM2.Archive @@ -989,7 +989,7 @@ if [[ ! $autoAnswerYes || -f /tmp/a2server-setupNetBoot ]]; then cppo -s -ad snap.bxy . &> /dev/null fi if [[ ! -f SNAP.Archive/SNAP ]]; then - wget -qO snap.bxy ${binaryURL}external/appleii/snap.bxy + wget -qO snap.bxy "${binaryURL}external/appleii/snap.bxy" cppo -s -ad snap.bxy . &> /dev/null fi cd SNAP.Archive @@ -1002,7 +1002,7 @@ if [[ ! $autoAnswerYes || -f /tmp/a2server-setupNetBoot ]]; then 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 + wget -qO- "${binaryURL}snap-setup.tgz" | tar Pzx afpsync -v $gsosDir > /dev/null fi diff --git a/setup/index.txt b/setup/index.txt index cc050e1..2960ba1 100755 --- a/setup/index.txt +++ b/setup/index.txt @@ -6,9 +6,6 @@ # netatalk configured for Apple II use on Debian or Raspbian. # more info is at http://ivanx.com/a2server -# to download and execute, type: -# wget ivanx.com/a2server/setup; source setup - a2serverVersion="1.5.1" a2sDevel="$( dirname "${BASH_SOURCE[0]}" )/.."