happy with that, ish

install.sh

@@ -14,17 +14,12 @@ elif [ $(which pacman) ]; then
   PIP="pip2"
 fi
 
-(
-set +e
-QEMU_RUN=$(qemu/qira-i386)
-if [ $? == 1 ]; then
+if [ $(qemu/qira-i386 > /dev/null; echo $?) == 1 ]; then
   echo "QIRA QEMU appears to run okay"
 else
-  set -e
   echo "building QEMU"
   ./qemu_build.sh
 fi
-)
 
 echo "installing pip packages"
 sudo $PIP install html flask-socketio pillow pyelftools socketIO-client ./qiradb

qemu_build.sh

@@ -1,4 +1,15 @@
-#!/bin/bash -e
+#!/bin/bash
+
+# if you don't have ubuntu you are on your own here
+if [ $(which apt-get) ]; then
+  echo "fetching qemu build-deps, enter your password"
+  sudo apt-get update
+  sudo apt-get --no-install-recommends -y build-dep qemu
+  sudo apt-get install wget
+fi
+
+# ok, strict mode
+set -e
 
 # get qemu if we don't have it
 if [ ! -d qemu/qemu-latest ]; then
@@ -23,13 +34,6 @@ if [ ! -d qemu/qemu-latest ]; then
   cd ../../
 fi
 
-# if you don't have ubuntu you are on your own here
-if [ $(which apt-get) ]; then
-  echo "fetching qemu build-deps, enter your password"
-  sudo apt-get update
-  sudo apt-get --no-install-recommends -y build-dep qemu
-fi
-
 cd qemu/qemu-latest
 ln -sf ../../qemu_mods/tci.c tci.c
 ln -sf ../../qemu_mods/disas.c disas.c