Apple-2-SW/a2server
1
0
Fork 0
mirror of https://github.com/RasppleII/a2server.git synced 2026-04-19 23:16:29 +00:00
Code Issues Projects Releases Wiki Activity

replace nulib2 with 3.1.0a1 which handles empty forks correctly

Browse Source 
hide all cppo output in netboot install
remove guidance about uppercase filenames in afpsync error message
This commit is contained in:
Ivan X
2016-01-03 05:13:15 -05:00
parent 5fab6a21af
commit 1af347ae8f
4 changed files with 26 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files
scripts/a2server-2-tools.txt
+17 -8
View File
@@ -45,16 +45,25 @@ fi
echo "A2SERVER: Installing A2SERVER tools..."
if ! command -v nulib2 > /dev/null; then
# delete older nulib2 which doesn't correctly handle zero-length forks in GSHK-created archives
if hash nulib2 &> /dev/null; then
nulib2version=$(nulib2 | sed -n 2p | sed 's|^.*v\([0-9]\)\.\([0-9]\)\.\([0-9]\).*$|\1\2\3|' 2> /dev/null)
if (( $nulib2version < 310 )); then
sudo apt-get -y purge nulib2 &> /dev/null
sudo rm $(command -v nulib2) &> /dev/null
fi
fi
if ! hash nulib2 &> /dev/null; then
echo "A2SERVER: Installing nulib2..."
cd /tmp
if [[ $arch ]]; then
{ wget -qO- "${binaryURL}precompiled/nulib2-${arch}.tgz" | sudo tar Pzx; } &> /dev/null
{ wget -qO- "${binaryURL}precompiled/nulib2-3.1.0-${arch}.tgz" | sudo tar Pzx; } &> /dev/null
fi
if ! command -v nulib2 > /dev/null; then
if ! hash nulib2 &> /dev/null; then
if [[ ! -f /tmp/a2server-packageReposUpdated ]]; then
# prepare for installing packages
@@ -132,12 +141,12 @@ if ! command -v unar > /dev/null; then
mkdir /tmp/unar
cd /tmp/unar
if [[ $useExternalURL ]]; then
wget -O unar_1.8.zip https://github.com/incbee/Unarchiver/archive/unar-1.8.zip
unzip -o unar_1.8.zip &> /dev/null
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.zip ${binaryURL}external/source/unar-1.8.zip
unzip -o unar_1.8.zip &> /dev/null
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
make -f Makefile.linux
scripts/a2server-5-netboot.txt
+8 -8
View File
@@ -280,7 +280,7 @@ if [[ ! $autoAnswerYes || -f /tmp/a2server-setupNetBoot ]]; then
wget -qO $outfile "${binaryURL}external/appleii/gsos603/$diskname.po"
fi
fi
cppo -s -ad $outfile $netInstallDir 2> /dev/null
cppo -s -ad $outfile $netInstallDir &> /dev/null
done
rm *.sea* &> /dev/null
sed -i "s/\([^\\]\r:\)/\1A2FILES:GSOS.Installer:Net.Install:/g" $netInstallDir/Install/Scripts/*
@@ -472,7 +472,7 @@ if [[ ! $autoAnswerYes || -f /tmp/a2server-setupNetBoot ]]; then
wget -qO shrinkit.sdk ${binaryURL}external/appleii/shrinkit.sdk
nulib2 -x -s shrinkit.sdk &> /dev/null
fi
cppo -s -ad SHRINKIT /SHRINKIT/SHRINKIT $diskToolsP8Dir 2> /dev/null
cppo -s -ad SHRINKIT /SHRINKIT/SHRINKIT $diskToolsP8Dir &> /dev/null
afpsync -v $sharepath > /dev/null
fi
@@ -515,10 +515,10 @@ if [[ ! $autoAnswerYes || -f /tmp/a2server-setupNetBoot ]]; then
fi
truncate -s 819284 'Apple II System Disk 3.2.sea'
dd if='Apple II System Disk 3.2.sea' of=A2SYSDISK32.HDV bs=84 skip=1 2> /dev/null
cppo -s -ad A2SYSDISK32.HDV /UTILITIES/SYSUTIL.SYSTEM $diskToolsP8Dir/SYSUTIL 2> /dev/null
cppo -s -ad A2SYSDISK32.HDV /UTILITIES/UTIL.0 $diskToolsP8Dir 2> /dev/null
cppo -s -ad A2SYSDISK32.HDV /UTILITIES/UTIL.1 $diskToolsP8Dir 2> /dev/null
cppo -s -ad A2SYSDISK32.HDV /UTILITIES/UTIL.2 $diskToolsP8Dir 2> /dev/null
cppo -s -ad A2SYSDISK32.HDV /UTILITIES/SYSUTIL.SYSTEM $diskToolsP8Dir/SYSUTIL &> /dev/null
cppo -s -ad A2SYSDISK32.HDV /UTILITIES/UTIL.0 $diskToolsP8Dir &> /dev/null
cppo -s -ad A2SYSDISK32.HDV /UTILITIES/UTIL.1 $diskToolsP8Dir &> /dev/null
cppo -s -ad A2SYSDISK32.HDV /UTILITIES/UTIL.2 $diskToolsP8Dir &> /dev/null
afpsync -v $sharepath > /dev/null
fi
@@ -571,7 +571,7 @@ if [[ ! $autoAnswerYes || -f /tmp/a2server-setupNetBoot ]]; then
wget -qO spectrum_gold_2mg.zip ${binaryURL}external/appleii/spectrum/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
fi
cppo -s -ad Spectrum.Gold.HDV .
cppo -s -ad Spectrum.Gold.HDV . &> /dev/null
userFolder=$(tr [:lower:] [:upper:] <<< $USER)
for thisFolder in \
Installer/Extras/CDEvs^System/CDevs \
@@ -610,7 +610,7 @@ if [[ ! $autoAnswerYes || -f /tmp/a2server-setupNetBoot ]]; then
echo
cd /tmp/netboot
wget -qO A2CLOUD.HDV "${binaryURL}A2CLOUD.HDV"
cppo -ad A2CLOUD.HDV . > /dev/null
cppo -ad A2CLOUD.HDV . &> /dev/null
cd A2CLOUD
mv *PT3* *PROTERM* $protermDir
mv Z.LINK $zlinkDir
scripts/tools/afpsync.txt
-2
View File
@@ -43,7 +43,6 @@ processPath () {
echo "AppleDouble files have been updated for volume $sharepath."
else
[[ ! $renameLower ]] && echo "Could not update all files on volume $sharepath."
[[ ! $renameLower ]] && echo "Ensure filenames are all caps on volume $sharepath."
if [[ $showerrors ]]; then
echo $result \
| while read LINE; do
@@ -63,7 +62,6 @@ processPath () {
$0 $sharepath
else
echo "Use afpsync -e to see error details."
echo "Use afpsync -r to rename lowercase names to uppercase."
fi
fi
unset IFS
setup/index.txt
+1 -1
View File
@@ -9,7 +9,7 @@
# to download and execute, type:
# wget ivanx.com/a2server/setup; source setup
a2serverVersion="129d1"
a2serverVersion="129d2"
# Ensure URL we'll use ends in a /
case "$A2SERVER_SCRIPT_URL" in