Cleanup install

get-packages.sh

+#
+# skeleton get-packages.sh
+#
+
+#
+# do not need any additional packages above and beyond Zipr toolchain
+# those packages will be installed separately
+#
+
 args="$@"
 if [[ $args = "" ]]; then
         args="all"
@@ -13,22 +22,3 @@ for arg in $args; do
 		;;
 	esac
 done
-
-# @todo: none of these are necessary?
-#        these were for building QEMU/afl but that's not a zfuzz concern
-which apt-get >/dev/null 2>/dev/null
-if [ $? -eq 0 ]; then
-	PKGS="libtool glib2.0-dev texinfo libtool-bin"
-else
-	PKGS="libtool glib2.0-dev texinfo"
-fi
-
-for i in $PKGS
-do
-	which apt-get >/dev/null 2>/dev/null
-	if [ $? -eq 0 ]; then
-		sudo apt-get install $i -y --force-yes
-	else
-		sudo yum install $i -y --skip-broken
-	fi
-done

set_env_vars

 export ZFUZZ_HOME=`pwd`
 export AFL_TRANSFORMS=$ZFUZZ_HOME/afl_transforms
-export AFL_PATH=$ZFUZZ_HOME/afl
-export PATH=$PATH:$AFL_PATH:$ZFUZZ_HOME/bin
+export PATH=$PATH:$ZFUZZ_HOME/bin
 export AFL_SKIP_BIN_CHECK=1
 export LD_LIBRARY_PATH=$LD_LIBRARY_PATH:$SECURITY_TRANSFORMS_HOME/lib

util/setup-afl.sh

@@ -16,6 +16,9 @@ if [ ! -e afl ]; then
 	make
 #	cd qemu_mode && ./build_qemu_support.sh
 
+	AFL_PATH=/home/tester/zafl_umbrella/zfuzz/afl
+	export AFL_PATH
+
 	# afl wants this
 	sudo $ZFUZZ_HOME/util/afl_setup_core_pattern.sh
 fi