Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Updated install script #187

Merged
merged 4 commits into from
Apr 24, 2020
Merged

Updated install script #187

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
a4483c0
updated setup_database to run as python3 during install
Cx01N Apr 22, 2020
a14bf0c
fixed python3 call to setup_database in reset script
Cx01N Apr 22, 2020
8a40e67
updated install script
Cx01N Apr 22, 2020
95d4e03
readded python3-m2crypto to apt install
Cx01N Apr 23, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 4 additions & 7 deletions setup/install.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -120,7 +120,7 @@ Pip_file="requirements.txt"

if lsb_release -d | grep -q "Kali"; then
apt-get update
sudo apt-get install -y make autoconf g++ python-dev python-m2crypto swig python-pip libxml2-dev default-jdk zlib1g-dev libssl1.1 build-essential libssl-dev libxml2-dev zlib1g-dev
sudo apt-get install -y make autoconf g++ python3-dev swig python3-pip python3-m2crypto libxml2-dev default-jdk zlib1g-dev libssl1.1 build-essential libssl-dev libxml2-dev zlib1g-dev
elif lsb_release -d | grep -q "Ubuntu"; then
if is_libssl_1_0; then
LibSSL_pkgs="libssl1.0.0 libssl-dev"
Expand All @@ -129,7 +129,7 @@ elif lsb_release -d | grep -q "Ubuntu"; then
LibSSL_pkgs="libssl1.1 libssl-dev"
fi
sudo apt-get update
sudo apt-get install -y make autoconf g++ python-dev python-m2crypto swig python-pip libxml2-dev default-jdk $LibSSL_pkgs build-essential
sudo apt-get install -y make autoconf g++ python3-dev swig python3-pip python3-m2crypto libxml2-dev default-jdk $LibSSL_pkgs build-essential
else
echo "Unknown distro - Debian/Ubuntu Fallback"
if is_libssl_1_0; then
Expand All @@ -139,7 +139,7 @@ else
LibSSL_pkgs="libssl1.1 libssl-dev"
fi
sudo apt-get update
sudo apt-get install -y make autoconf g++ python-dev python-m2crypto swig python-pip libxml2-dev default-jdk libffi-dev $LibSSL_pkgs build-essential
sudo apt-get install -y make autoconf g++ python3-dev swig python3-pip python3-m2crypto libxml2-dev default-jdk libffi-dev $LibSSL_pkgs build-essential
fi

install_xar
Expand All @@ -154,12 +154,9 @@ if ls /usr/bin/ | grep -q "python3"; then
fi
sudo pip3 install -r $Pip_file
fi
if ls /usr/bin/ | grep -q "python2"; then
sudo pip install -r $Pip_file
fi

# set up the database schema
python ./setup_database.py
python3 ./setup_database.py

# generate a cert
./cert.sh
Expand Down
3 changes: 1 addition & 2 deletions setup/requirements.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,12 +10,11 @@ pyOpenSSL
pyinstaller
zlib_wrapper
netifaces
M2Crypto
jinja2
cryptography
pyminifier
xlutils
pefile
simplejson
bcrypt
pycrypto
pycrypto
3 changes: 2 additions & 1 deletion setup/requirements_libssl1.0.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,10 +10,11 @@ pyOpenSSL==17.2.0
pyinstaller
zlib_wrapper
netifaces
M2Crypto
jinja2
cryptography
pyminifier==2.1
xlutils
pefile
pycrypto
bcrypt
simplejson
2 changes: 1 addition & 1 deletion setup/reset.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ then
rm ../data/empire.db
fi

python ./setup_database.py
python3 ./setup_database.py
cd ..

# remove the debug file if it exists
Expand Down