From 74bc296552e4cc2eaa8e633923b526874d01058a Mon Sep 17 00:00:00 2001 From: Bob Mottram Date: Mon, 21 Aug 2017 21:11:56 +0100 Subject: [PATCH] Bump gnusocial and pleroma commits --- src/freedombone-app-gnusocial | 2 +- src/freedombone-utils-gnusocialtools | 4 +++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/src/freedombone-app-gnusocial b/src/freedombone-app-gnusocial index 7643bfc9..de77136d 100755 --- a/src/freedombone-app-gnusocial +++ b/src/freedombone-app-gnusocial @@ -37,7 +37,7 @@ GNUSOCIAL_DOMAIN_NAME= GNUSOCIAL_CODE= GNUSOCIAL_ONION_PORT=8087 GNUSOCIAL_REPO="https://git.gnu.io/gnu/gnu-social.git" -GNUSOCIAL_COMMIT='05a9c11c476b384e5ef3f3cc83b66406fcf7a378' +GNUSOCIAL_COMMIT='d61375cb7fd9e3ac2dbba2b22d0d6461fb753892' GNUSOCIAL_ADMIN_PASSWORD= GNUSOCIAL_BACKGROUND_IMAGE_URL= diff --git a/src/freedombone-utils-gnusocialtools b/src/freedombone-utils-gnusocialtools index 758c3129..7885ff08 100755 --- a/src/freedombone-utils-gnusocialtools +++ b/src/freedombone-utils-gnusocialtools @@ -33,7 +33,7 @@ QVITTER_THEME_REPO="https://git.postactiv.com/bob/Qvitter" QVITTER_THEME_COMMIT='b5791cf935a6391c492cefa1ffa50cc3cea44c12' PLEROMA_REPO="https://gitgud.io/lambadalambda/pleroma-fe" -PLEROMA_COMMIT='7d59051fc5e93585d8d9858ac989d9ebf7aa3cf9' +PLEROMA_COMMIT='cbe652f2d94d81fa54a37378b7ff014c4391ca5e' ARMADILLO_REPO="https://git.postactiv.com/maiya/Armadillo" ARMADILLO_COMMIT='ec3938a678f373156c4cbf37926c9a5ab68222c4' @@ -409,6 +409,7 @@ function install_pleroma_front_end { npm install -g eslint-plugin-promise@3.5.0 npm install -g moment@2.18.1 npm install -g node-sass@4.5.2 + npm install -g whatwg-fetch@2.0.3 yarn if [ -f $INSTALL_DIR/pleroma/dist/index.html ]; then rm -rf $INSTALL_DIR/pleroma/dist/* @@ -452,6 +453,7 @@ function upgrade_pleroma { if [ -d $INSTALL_DIR/pleroma ]; then set_repo_commit $INSTALL_DIR/pleroma "${app_name} pleroma commit" "$PLEROMA_COMMIT" $PLEROMA_REPO cd $INSTALL_DIR/pleroma + yarn npm run build if [ ! -d $INSTALL_DIR/pleroma/dist ]; then echo 'Unable to build pleroma'