Merge branch '2.0_beta' of https://github.com/adaptivethreat/Empire into 2.0_beta

mdns
xorrior 2016-09-29 11:41:49 -04:00
commit dead9f08a1
2 changed files with 12 additions and 3 deletions

View File

@ -1,3 +1,8 @@
Running
---------
-Fix for issue 340 Added pip install setuptools and apt-get install libssl-dev
9/23/2016
---------
-Version 2.0.0 beta, DerbyCon release

View File

@ -15,7 +15,8 @@ fi
version=$( lsb_release -r | grep -oP "[0-9]+" | head -1 )
if lsb_release -d | grep -q "Fedora"; then
Release=Fedora
dnf install -y python-devel m2crypto python-m2ext swig python-iptools python3-iptools libxml2-devel default-jdk
dnf install -y python-devel m2crypto python-m2ext swig python-iptools python3-iptools libxml2-devel default-jdk openssl-devel
pip install setuptools
pip install pycrypto
pip install iptools
pip install pydispatcher
@ -24,7 +25,8 @@ if lsb_release -d | grep -q "Fedora"; then
pip install dropbox
elif lsb_release -d | grep -q "Kali"; then
Release=Kali
apt-get install -y python-dev python-m2crypto swig python-pip libxml2-dev default-jdk
apt-get install -y python-dev python-m2crypto swig python-pip libxml2-dev default-jdk libssl-dev
pip install setuptools
pip install pycrypto
pip install iptools
pip install pydispatcher
@ -33,7 +35,8 @@ elif lsb_release -d | grep -q "Kali"; then
pip install dropbox
elif lsb_release -d | grep -q "Ubuntu"; then
Release=Ubuntu
apt-get install -y python-dev python-m2crypto swig python-pip libxml2-dev default-jdk
apt-get install -y python-dev python-m2crypto swig python-pip libxml2-dev default-jdk libssl-dev
pip install setuptools
pip install pycrypto
pip install iptools
pip install pydispatcher
@ -44,6 +47,7 @@ elif lsb_release -d | grep -q "Ubuntu"; then
else
echo "Unknown distro - Debian/Ubuntu Fallback"
apt-get install -y python-dev python-m2crypto swig python-pip libxml2-dev default-jdk
pip install setuptools
pip install pycrypto
pip install iptools
pip install pydispatcher