From 744210338c636d878a5d5e1f26a7771da1156ed8 Mon Sep 17 00:00:00 2001
From: "T. Joseph Carter" <tjcarter@spiritsubstance.com>
Date: Mon, 23 Apr 2018 05:49:45 -0700
Subject: [PATCH] Fix unar error introduced in 30ccb87

I'd removed debianMajor and the like in the last commit, but I missed
one instance of it being used: To install the unar package on jessie and
greater systems.  Well, jessie is now oldstable and wheezy is so
obsolete you're not even recommended to upgrade from it.  Nowadays, we
should just be installing the package.

We ought to check for it in /usr/local and see if we can determine if
its an old version and remove it, probably.  If someone else would like
to tackle that, feel free.
---
 setup/ivan.sh | 60 +++++++++++++++++++++------------------------------
 1 file changed, 24 insertions(+), 36 deletions(-)

diff --git a/setup/ivan.sh b/setup/ivan.sh
index f55d105..d7e6e8f 100755
--- a/setup/ivan.sh
+++ b/setup/ivan.sh
@@ -1131,46 +1131,34 @@ if [[ $installArchiveTools ]]; then
 		echo "A2CLOUD: Installing The Unarchiver..."
 
 		# jessie and later: Just use the unar package
-		if [[ $debianMajor -ge 8 ]]; then
-			sudo apt-get -y install unar
-			sudo apt-get clean
-		fi
+		sudo apt-get -y install unar
+		sudo apt-get clean
 
+		# If all else fails, compile from source.
 		if ! hash unar 2> /dev/null; then
-			if [[ $downloadBinaries && "$(apt-cache search '^libgnustep-base1.22$')" ]]; then
-				# Dependencies: for unar
-				sudo apt-get -y install libgnustep-base1.22
-				sudo apt-get clean
-				wget -qO- "${a2cBinaryURL}/picopkg/unar-${ras2_os}_${ras2_arch}.tgz" | sudo tar Pzx &> /dev/null
+			# Dependencies: build-deps for unar
+			sudo apt-get -y install build-essential libgnustep-base-dev libz-dev libbz2-dev libssl-dev libicu-dev unzip
+			sudo apt-get clean
+
+			rm -rf /tmp/unar &> /dev/null
+			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
+				unzip -o unar-1.8.1.zip &> /dev/null
 			fi
-
-			# If all else fails, compile from source.
-
-			if ! hash unar 2> /dev/null; then
-				# Dependencies: build-deps for unar
-				sudo apt-get -y install build-essential libgnustep-base-dev libz-dev libbz2-dev libssl-dev libicu-dev unzip
-				sudo apt-get clean
-
-				rm -rf /tmp/unar &> /dev/null
-				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
-					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 "${a2cBinaryURL}/source/unar-1.8.1.zip"
-					unzip -o unar-1.8.1.zip &> /dev/null
-				fi
-				cd *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
-				rm -rf /tmp/unar
+			if [ ! -d *Unarchiver*/XADMaster ]; then # need single bracket for glob
+				wget -O unar-1.8.1.zip "${a2cBinaryURL}/source/unar-1.8.1.zip"
+				unzip -o unar-1.8.1.zip &> /dev/null
 			fi
+			cd *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
+			rm -rf /tmp/unar
 			sudo mandb &> /dev/null
 		fi
 	else