make python3 the default

This commit is contained in:
George Hotz 2019-03-23 21:08:20 -07:00
parent d76b3706d6
commit e1b0c65d1b
3 changed files with 13 additions and 19 deletions

View File

@ -124,3 +124,12 @@ dirtyiaddr -- whether we should update the clnum based on the iaddr or not
flat -- if we are in flat view
</pre>
## Static
QIRA static has historically been such a trash heap it's gated behind -S. QIRA should not be trying to compete with IDA.
User input and the actual traces of the program should drive creation of the static database. Don't try to recover all CFGs, only what ran.
The basic idea of static is that it exists at change -1 and doesn't change ever. Each address has a set of tags, including things like name.

View File

@ -1,12 +1,5 @@
#!/bin/bash -e
# default is just pip, but on things like arch where python 3 is default, it's pip2
if [ $(which pip2) ]; then
PIP="pip2"
else
PIP="pip"
fi
unamestr=$(uname)
arch=$(uname -p)
@ -20,10 +13,8 @@ if [[ "$unamestr" == 'Linux' ]]; then
sudo apt-get -y install build-essential debootstrap debian-archive-keyring libjpeg-dev zlib1g-dev unzip wget graphviz curl python-dev python-pip python-virtualenv git wget flex bison libtool automake autoconf autotools-dev pkg-config libglib2.0-dev
elif [ $(which pacman) ]; then
sudo pacman -S --needed --noconfirm base-devel python2-pip python2-virtualenv
PIP="pip2"
elif [ $(which dnf) ]; then
sudo dnf install -y python-pip python-devel gcc gcc-c++ python-virtualenv glib2-devel
PIP="pip2"
elif [ $(which yum) ]; then
sudo yum install -y python-pip python-devel gcc gcc-c++ python-virtualenv glib2-devel
elif [ $(which zypper) ]; then
@ -54,16 +45,10 @@ fi
echo "installing pip packages"
if [ $(which virtualenv2) ]; then
VIRTUALENV="virtualenv2"
else
VIRTUALENV="virtualenv"
fi
$VIRTUALENV venv
virtualenv venv --python=python3
source venv/bin/activate
$PIP install --upgrade pip
$PIP install --upgrade -r requirements.txt
pip3 install --upgrade pip
pip3 install --upgrade -r requirements.txt
echo "making symlink"
sudo ln -sf $(pwd)/qira /usr/local/bin/qira

2
qira
View File

@ -15,4 +15,4 @@ fi
unset PYTHONPATH
source $DIR/venv/bin/activate
exec /usr/bin/env python2.7 $DIR/middleware/qira.py $*
exec /usr/bin/env python3 $DIR/middleware/qira.py $*