Use python 3

This commit is contained in:
Bob Mottram 2018-06-02 15:36:50 +01:00
parent 35ff9c7892
commit 88e4272d7a
1 changed files with 5 additions and 3 deletions

View File

@ -34,7 +34,7 @@ MICROBLOGPUB_DOMAIN_NAME=
MICROBLOGPUB_CODE= MICROBLOGPUB_CODE=
MICROBLOGPUB_ONION_PORT=9261 MICROBLOGPUB_ONION_PORT=9261
MICROBLOGPUB_REPO="https://github.com/tsileo/microblog.pub" MICROBLOGPUB_REPO="https://github.com/tsileo/microblog.pub"
MICROBLOGPUB_COMMIT='848b8b23a8765d86bab2830c8d65d6b37337d03b' MICROBLOGPUB_COMMIT='791e55c7f5eee26792b90b94668d5f0dbbc767f9'
MICROBLOGPUB_PORT_INTERNAL=5005 MICROBLOGPUB_PORT_INTERNAL=5005
# These parameters are used by the FreedomBox mobile app # These parameters are used by the FreedomBox mobile app
@ -310,6 +310,8 @@ function remove_microblogpub {
} }
function install_microblogpub { function install_microblogpub {
apt-get -yq install python3-pip python3-flask
install_mongodb install_mongodb
if [ ! "$MICROBLOGPUB_DOMAIN_NAME" ]; then if [ ! "$MICROBLOGPUB_DOMAIN_NAME" ]; then
@ -338,11 +340,11 @@ function install_microblogpub {
git checkout "$MICROBLOGPUB_COMMIT" -b "$MICROBLOGPUB_COMMIT" git checkout "$MICROBLOGPUB_COMMIT" -b "$MICROBLOGPUB_COMMIT"
set_completion_param "microblogpub commit" "$MICROBLOGPUB_COMMIT" set_completion_param "microblogpub commit" "$MICROBLOGPUB_COMMIT"
pip install -r requirements.txt pip3 install -r requirements.txt
{ echo 'import sass'; { echo 'import sass';
echo "sass.compile(dirname=('sass', 'static/css'), output_style='compressed')"; } > generate_css.py echo "sass.compile(dirname=('sass', 'static/css'), output_style='compressed')"; } > generate_css.py
python generate_css.py python3 generate_css.py
{ echo "username: '$MY_USERNAME'"; { echo "username: '$MY_USERNAME'";
echo "name: '$MY_NAME'"; echo "name: '$MY_NAME'";