Merge pull request #90 from LosFuzzys/fixes

Fixes

bin/manage-tools

@@ -34,10 +34,10 @@ function tool_log()
 
 function detect_distribution()
 {
-	if which pacman 2>&1 >/dev/null; then
+	if which pacman >/dev/null 2>&1; then
 		echo "archlinux"
-	elif which apt-get 2>&1 >/dev/null; then
-		if lsb_release -a 2>/dev/null | grep -i ubuntu 2>&1 >/dev/null; then
+	elif which apt-get >/dev/null 2>&1; then
+		if lsb_release -a 2>/dev/null | grep -i ubuntu >/dev/null 2>&1; then
 			echo "ubuntu"
 		else
 			echo "debian"
@@ -262,9 +262,9 @@ case $ACTION in
 		# execute install script
 		set +e
 		if [ "$VERBOSE_OUTPUT" -eq 1 ]; then
-			env DISTRI=$DISTRI ./install 2>&1 | tee -a install.log
+			DISTRI=$DISTRI ./install 2>&1 | tee -a install.log
 		else
-			env DISTRI=$DISTRI ./install >>install.log 2>&1
+			DISTRI=$DISTRI ./install >>install.log 2>&1
 		fi
 		INSTALL_FAILED=$?
 		set -e

radare2/install

@@ -17,3 +17,5 @@ LD_LIBRARY_PATH=\$LD_LIBRARY_PATH:$PWD/../lib $PWD/$i.real "\$@"
 END
 	chmod 755 $i
 done
+
+ctf-tools-pip install -yU r2pipe

radare2/uninstall

@@ -0,0 +1,3 @@
+#/bin/bash -e
+
+ctf-tools-pip uninstall -y r2pipe || true

stegdetect/install-root-archlinux

@@ -0,0 +1,7 @@
+#!/bin/bash
+set -eu -o pipefail
+
+echo "ERROR: archlinux has no aclocal-1.4. only $(aclocal --version | head -n 1)"
+exit 1
+
+pacman -Syu --noconfirm --needed automake