From e943aa7823a0970995188789817652843b3aa335 Mon Sep 17 00:00:00 2001
From: "T. Joseph Carter" <iKarith@users.noreply.github.com>
Date: Tue, 17 Nov 2015 16:22:26 -0800
Subject: [PATCH] setup.txt: Use deb of unar if it exists (jessie+)

---
 setup/setup.txt | 66 ++++++++++++++++++++++++++-----------------------
 1 file changed, 35 insertions(+), 31 deletions(-)

diff --git a/setup/setup.txt b/setup/setup.txt
index fecc632..b8efbfd 100644
--- a/setup/setup.txt
+++ b/setup/setup.txt
@@ -1226,40 +1226,44 @@ if [[ $installArchiveTools ]]; then
 
     # download and install The Unarchiver, for expanding apple.com disk images
     # http://wakaba.c3.cx/s/apps/unarchiver.html
-    if [[ ! -f /usr/local/bin/unar ]]; then
+    if ! command -v unar >/dev/null; then
         echo "A2CLOUD: Installing The Unarchiver..."
-        cd /tmp/a2cloud-install
-        if [[ $downloadBinaries ]]; then
-            if [[ $isRpi || $isDebian ]]; then
-                sudo apt-get -y install libgnustep-base1.22
-                sudo apt-get -y clean
-                if [[ $isRpi ]]; then
-                    wget -qO- http://appleii.ivanx.com/a2cloud/files/unar-rpi.tgz | sudo tar Pzx
-                elif [[ $isDebian ]]; then
-                    wget -qO- http://appleii.ivanx.com/a2cloud/files/unar-debian7_x86.tgz | sudo tar Pzx
+        if apt-cache show unar &>/dev/null; then
+            sudo apt-get -y install unar
+        else
+            cd /tmp/a2cloud-install
+            if [[ $downloadBinaries ]]; then
+                if [[ $isRpi || $isDebian ]]; then
+                    sudo apt-get -y install libgnustep-base1.22
+                    sudo apt-get -y clean
+                    if [[ $isRpi ]]; then
+                        wget -qO- http://appleii.ivanx.com/a2cloud/files/unar-rpi.tgz | sudo tar Pzx
+                    elif [[ $isDebian ]]; then
+                        wget -qO- http://appleii.ivanx.com/a2cloud/files/unar-debian7_x86.tgz | sudo tar Pzx
+                    fi
                 fi
             fi
+            if ! command -v unar >/dev/null; then
+                sudo apt-get -y install build-essential
+                sudo apt-get -y install libgnustep-base-dev libz-dev libbz2-dev
+                sudo apt-get -y install libssl-dev libicu-dev unzip
+                sudo apt-get -y clean
+                rm -rf unar &> /dev/null
+                mkdir -p unar
+                cd unar
+                wget -q -nc http://theunarchiver.googlecode.com/files/unar1.7_src.zip
+                unzip -o unar1.7_src.zip
+                cd The\ Unarchiver/XADMaster
+                make -f Makefile.linux
+                sudo mv lsar unar /usr/local/bin
+                cd ../Extra
+                sudo mkdir -p /usr/local/man/man1
+                sudo mv lsar.1 unar.1 /usr/local/man/man1
+                cd /tmp/a2cloud-install
+                rm -rf unar
+            fi
+            sudo mandb &> /dev/null
         fi
-        if [[ ! -f /usr/local/bin/unar ]]; then
-            sudo apt-get -y install build-essential
-            sudo apt-get -y install libgnustep-base-dev libz-dev libbz2-dev
-            sudo apt-get -y install libssl-dev libicu-dev unzip
-            sudo apt-get -y clean
-            rm -rf unar &> /dev/null
-            mkdir -p unar
-            cd unar
-            wget -q -nc http://theunarchiver.googlecode.com/files/unar1.7_src.zip
-            unzip -o unar1.7_src.zip
-            cd The\ Unarchiver/XADMaster
-            make -f Makefile.linux
-            sudo mv lsar unar /usr/local/bin
-            cd ../Extra
-            sudo mkdir -p /usr/local/man/man1
-            sudo mv lsar.1 unar.1 /usr/local/man/man1
-            cd /tmp/a2cloud-install
-            rm -rf unar
-        fi
-        sudo mandb &> /dev/null
     else
         echo "A2CLOUD: The Unarchiver is already installed."
     fi
@@ -1418,7 +1422,7 @@ if [[ $a2CloudDisk ]]; then
             acmd -g /usr/local/adtpro/disks/VDRIVE-*DSK VEDRIVE.CONFIG - | acmd -p "$a2CloudDisk" VEDRIVE.CONFIG BAS
 
             # Apple System Utilities 3.1 support files
-            if [[ -f /usr/local/bin/unar ]]; then
+            if command -v unar >/dev/null; then
                 echo "A2CLOUD: Downloading and copying System Utilities support files..."
                 cd /tmp/a2cloud-install
                 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