Merge branch 'Strazzom-master' into dev #994

2018-03-13 23:53:50 -04:00 · 2018-03-13 23:53:50 -04:00 · 23c4d40ee5
parent e65e15c982 20462fccc8
commit 23c4d40ee5
3 changed files with 3 additions and 2 deletions
--- a/setup/install.sh
+++ b/setup/install.sh
@ -174,7 +174,7 @@ fi
 chmod 755 bomutils/build/bin/mkbom && sudo cp bomutils/build/bin/mkbom /usr/local/bin/.

 # set up the database schema
-./setup_database.py
+python ./setup_database.py

 # generate a cert
 ./cert.sh
--- a/setup/requirements.txt
+++ b/setup/requirements.txt
@ -15,3 +15,4 @@ jinja2
 cryptography
 pyminifier==2.1
 xlutils
+pycrypto
--- a/setup/reset.sh
+++ b/setup/reset.sh
@ -18,7 +18,7 @@ then
 	rm ../data/empire.db
 fi

-./setup_database.py
+python ./setup_database.py
 cd ..

 # remove the debug file if it exists