shipping v0.2

bdistrib.sh

@@ -22,7 +22,9 @@ mkdir -p distrib/qira
 echo "copying webapp"
 cp -R web distrib/qira/
 rm -rf distrib/qira/web/.meteor/local
+rm -f distrib/qira/web/qira.html   # this doesn't work to change, no don't allow the user to
 #mrt bundle ../bin/qira_web.tar.gz
+cp -R webstatic distrib/qira/
 
 # sudo apt-get install python-pip
 # sudo pip install pymongo
@@ -30,23 +32,22 @@ echo "copying middleware"
 mkdir -p distrib/qira/middleware
 cp middleware/*.py distrib/qira/middleware/
 
+
 # built for ida 6.6
 # perhaps build for older IDA as well, ie 6.1
 # and mac + windows
 # fairly standard deps + libcrypto, libssl, libz and libida
 mkdir -p distrib/qira/ida
-cd ida_plugin
-echo "building ida plugin"
-./build.sh
-cp qira.plx ../distrib/qira/ida/qira_ida66_linux.plx
-strip ../distrib/qira/ida/qira_ida66_linux.plx
-#cp ~/qira-release/ida/* ../distrib/qira/ida/
+cd ida
+echo "copying ida plugin"
+cp qira_ida66_linux.plx ../distrib/qira/ida/qira_ida66_linux.plx
+cp qira_ida66_mac.pmc ../distrib/qira/ida/qira_ida66_mac.pmc
 cd ../
 
 # fairly standard deps + librt, libglib, libpcre
 echo "copying qemu"
 mkdir -p distrib/qira/qemu
-cp qemu/qemu-latest/i386-linux-user/qemu-i386 distrib/qira/qemu/qira-i386
+cp qemu/qira-i386 distrib/qira/qemu/qira-i386
 strip distrib/qira/qemu/qira-i386
 
 # package up the python, hopefully this includes pymongo driver
@@ -71,6 +72,6 @@ cp -av install.sh qira qira-server distrib/qira/
 
 echo "making archive"
 cd distrib/
-tar zcvf qira-0.1.tar.gz qira
+tar zcvf qira-0.2.tar.gz qira
 cd ../
 

develinstall.sh

@@ -0,0 +1,22 @@
+#!/bin/bash
+set -e
+
+./install.sh
+./qemu_build.sh
+
+# we need meteor
+if [ ! -d ~/.meteor ]; then
+  echo "installing meteor"
+  curl https://install.meteor.com | /bin/sh
+fi
+
+# and mrt
+if [ ! -f ~/.meteor/tools/latest/bin/mrt ]; then
+  ~/.meteor/tools/latest/bin/npm install -g meteorite
+fi
+
+echo "making devel symlinks"
+sudo ln -sf $(pwd)/qemu/qira-sparc /usr/local/bin/qira-sparc
+sudo ln -sf $(pwd)/qemu/qira-sparc32plus /usr/local/bin/qira-sparc32plus
+sudo ln -sf $(pwd)/qemu/qira-x86_64 /usr/local/bin/qira-x86_64
+

ida/build.sh

@@ -23,3 +23,11 @@ if [ "$(diff $OUTPUT "$IDAROOT/plugins/$OUTPUT")" != "" ]; then
   cp $OUTPUT "$IDAROOT/plugins"
 fi
 
+if [[ "$unamestr" == 'Linux' ]]; then
+  cp $OUTPUT qira_ida66_linux.plx
+  strip qira_ida66_linux.plx
+elif [[ "$unamestr" == 'Darwin' ]]; then
+  cp $OUTPUT qira_ida66_mac.pmc
+  strip qira_ida66_mac.pmc
+fi
+

install.sh

@@ -1,37 +1,19 @@
 #!/bin/bash
 set -e
 
-# we need pymongo
+# we need pip to install python stuff
 if [ ! $(which pip) ]; then
   echo "installing pip"
   sudo apt-get install python-pip
 fi
 echo "installing pip packages"
-sudo pip install pymongo pyelftools blist flask-socketio
 
-# we need realpath...err ok for now
-if [ ! $(which realpath) ]; then
-  echo "installing realpath"
-  sudo apt-get install realpath
-fi
-
-# we need meteor
-if [ ! -d ~/.meteor ]; then
-  echo "installing meteor"
-  curl https://install.meteor.com | /bin/sh
-fi
-
-# and mrt
-if [ ! -f ~/.meteor/tools/latest/bin/mrt ]; then
-  ~/.meteor/tools/latest/bin/npm install -g meteorite
-fi
+# pymongo isn't really needed anymore
+sudo pip install pyelftools blist flask-socketio
 
 echo "making symlinks"
 sudo ln -sf $(pwd)/qira /usr/local/bin/qira
 sudo ln -sf $(pwd)/qira-server /usr/local/bin/qira-server
 sudo ln -sf $(pwd)/qemu/qira-i386 /usr/local/bin/qira-i386
 sudo ln -sf $(pwd)/qemu/qira-arm /usr/local/bin/qira-arm
-sudo ln -sf $(pwd)/qemu/qira-sparc /usr/local/bin/qira-sparc
-sudo ln -sf $(pwd)/qemu/qira-sparc32plus /usr/local/bin/qira-sparc32plus
-sudo ln -sf $(pwd)/qemu/qira-x86_64 /usr/local/bin/qira-x86_64
 

qira

@@ -6,10 +6,10 @@ if [ -z $1 ]; then
   exit -1
 fi
 
-BIN=$(realpath $1)
+BIN="$(pwd)/$1"
 FILE=$(file $BIN)
 
-ln -sf $BIN /tmp/qira_binary
+ln -sf "$BIN" /tmp/qira_binary
 
 # build qemu if we have the source
 if [ -d "qemu/qemu-latest" ]; then

web/smart.json

@@ -1,5 +0,0 @@
-{
-  "packages": {
-    "streams": {}
-  }
-}

web/smart.lock

@@ -1,15 +0,0 @@
-{
-  "meteor": {},
-  "dependencies": {
-    "basePackages": {
-      "streams": {}
-    },
-    "packages": {
-      "streams": {
-        "git": "https://github.com/arunoda/meteor-streams.git",
-        "tag": "v0.1.17",
-        "commit": "9fcbbc9b7bf542827babc92089c19e730892a22f"
-      }
-    }
-  }
-}