updates Nulib2 to 3.1.0a1; -c forces compile (no binaries); URL fixes

scripts/a2server-2-tools.txt

@@ -59,8 +59,8 @@ if ! hash nulib2 &> /dev/null; then
     echo "A2SERVER: Installing nulib2..."
 
     cd /tmp
-    if [[ $arch ]]; then
-        { wget -qO- "${binaryURL}precompiled/nulib2-3.1.0-${arch}.tgz" | sudo tar Pzx; } &> /dev/null
+    if [[ $arch && ! -f /tmp/a2server-compileAlways ]]; then
+        { wget -qO- "${binaryURL}precompiled/nulib2-3.1.0a1-${arch}.tgz" | sudo tar Pzx; } &> /dev/null
     fi
         
     if ! hash nulib2 &> /dev/null; then
@@ -76,27 +76,30 @@ if ! hash nulib2 &> /dev/null; then
         sudo apt-get -y clean
 
         cd /tmp
-        rm -rf /tmp/nulib &> /dev/null
-        mkdir /tmp/nulib
-        cd /tmp/nulib
+        rm -rf /tmp/nulib2 &> /dev/null
+        mkdir /tmp/nulib2
+        cd /tmp/nulib2
         if [[ $useExternalURL ]]; then
-            wget -q -O nulibdist.tar.gz http://web.archive.org/web/20131031160750/http://www.nulib.com/downloads/nulibdist.tar.gz
-            tar zxf nulibdist.tar.gz &> /dev/null
+            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
         fi
-        if [[ ! -d nulib2-220 ]]; then
-            wget -q -O nulibdist.tar.gz ${binaryURL}external/source/nulibdist.tar.gz
-            tar zxf nulibdist.tar.gz &> /dev/null
+        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
         fi
-        cd nufxlib*
+        cd nulib2*
+        cd nufxlib
         ./configure
         make
         sudo make install
-        cd ../nulib2*
+        cd ../nulib2
         ./configure
         make
         sudo make install
         cd
-        rm -rf /tmp/nulib
+        rm -rf /tmp/nulib2
     fi
 
 else
@@ -123,7 +126,7 @@ if ! command -v unar > /dev/null; then
     fi
     
     if ! command -v unar > /dev/null; then
-        if [[ $arch ]]; then
+        if [[ $arch && ! -f /tmp/a2server-compileAlways ]]; then
             # Dependencies: for unar
             sudo apt-get -y install libgnustep-base1.22
             sudo apt-get clean

scripts/a2server-3-sharing.txt

@@ -124,7 +124,7 @@ else
         fi
         
         # install Netatalk
-        if [[ $arch ]]; then
+        if [[ $arch && ! -f /tmp/a2server-compileAlways ]]; then
             { wget -qO- "${binaryURL}precompiled/netatalk224-${arch}_${debianName}.tgz" | sudo tar Pzx; } &> /dev/null
         fi
         sudo mandb &> /dev/null
@@ -200,7 +200,7 @@ fi
 if ! command -v macipgw > /dev/null; then
     echo "A2SERVER: Installing TCP over AppleTalk (MacIP)..."
     
-    if [[ $arch ]]; then
+    if [[ $arch && ! -f /tmp/a2server-compileAlways ]]; then
         { wget -qO- "${binaryURL}precompiled/macipgw-${arch}.tgz" | sudo tar Pzx; } 2> /dev/null
     fi
     
@@ -211,14 +211,16 @@ if ! command -v macipgw > /dev/null; then
         mkdir /tmp/macipgw
         cd /tmp/macipgw
         if [[ $useExternalURL ]]; then
-            wget -qO macipgw.zip "https://github.com/zero2sixd/macipgw/archive/master.zip"
-            unzip macipgw-src.zip &> /dev/null
+            wget -qO macipgw.zip "https://github.com/zero2sixd/macipgw/archive/2a5f6a7521a627e46b18468d44f4306fb0a7b7ab.zip"
+            unzip macipgw.zip 2> /dev/null
+            rm macipgw.zip &> /dev/null
         fi
         if [[ ! -d macipgw-master ]]; then
-            wget -qO macipgw-src.zip "${binaryURL}external/source/macipgw-src.zip"
-            unzip macipgw-src.zip &> /dev/null
+            wget -qO macipgw.zip "${binaryURL}external/source/macipgw.zip"
+            unzip macipgw.zip 2> /dev/null
+            rm macipgw.zip &> /dev/null
         fi
-        cd macipgw-master
+        cd macipgw*
         make
         sudo make install
         cd "$wd"
@@ -389,7 +391,7 @@ if ! command -v ciopfs > /dev/null; then
 
     # Dependency: For ciopfs
     sudo apt-get -y install fuse libglib2.0-0 libattr1 libfuse2
-    if [[ $arch ]]; then
+    if [[ $arch && ! -f /tmp/a2server-compileAlways ]]; then
         { wget -qO- "${binaryURL}precompiled/ciopfs-${arch}.tgz" | sudo tar Pzx; } &> /dev/null
     fi
     if [[ -f /etc/fuse.conf ]] && sudo grep -q user_allow_other /etc/fuse.conf; then

scripts/a2server-5-netboot.txt

@@ -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 &> /dev/null
+                    cppo -s -ad $outfile $netInstallDir
                 done
                 rm *.sea* &> /dev/null
                 sed -i "s/\([^\\]\r:\)/\1A2FILES:GSOS.Installer:Net.Install:/g" $netInstallDir/Install/Scripts/*