Преглед изворни кода

Bump gnusocial and pleroma commits

Bob Mottram пре 8 година
родитељ
комит
74bc296552
2 измењених фајлова са 4 додато и 2 уклоњено
  1. 1
    1
      src/freedombone-app-gnusocial
  2. 3
    1
      src/freedombone-utils-gnusocialtools

+ 1
- 1
src/freedombone-app-gnusocial Прегледај датотеку

37
 GNUSOCIAL_CODE=
37
 GNUSOCIAL_CODE=
38
 GNUSOCIAL_ONION_PORT=8087
38
 GNUSOCIAL_ONION_PORT=8087
39
 GNUSOCIAL_REPO="https://git.gnu.io/gnu/gnu-social.git"
39
 GNUSOCIAL_REPO="https://git.gnu.io/gnu/gnu-social.git"
40
-GNUSOCIAL_COMMIT='05a9c11c476b384e5ef3f3cc83b66406fcf7a378'
40
+GNUSOCIAL_COMMIT='d61375cb7fd9e3ac2dbba2b22d0d6461fb753892'
41
 GNUSOCIAL_ADMIN_PASSWORD=
41
 GNUSOCIAL_ADMIN_PASSWORD=
42
 
42
 
43
 GNUSOCIAL_BACKGROUND_IMAGE_URL=
43
 GNUSOCIAL_BACKGROUND_IMAGE_URL=

+ 3
- 1
src/freedombone-utils-gnusocialtools Прегледај датотеку

33
 QVITTER_THEME_COMMIT='b5791cf935a6391c492cefa1ffa50cc3cea44c12'
33
 QVITTER_THEME_COMMIT='b5791cf935a6391c492cefa1ffa50cc3cea44c12'
34
 
34
 
35
 PLEROMA_REPO="https://gitgud.io/lambadalambda/pleroma-fe"
35
 PLEROMA_REPO="https://gitgud.io/lambadalambda/pleroma-fe"
36
-PLEROMA_COMMIT='7d59051fc5e93585d8d9858ac989d9ebf7aa3cf9'
36
+PLEROMA_COMMIT='cbe652f2d94d81fa54a37378b7ff014c4391ca5e'
37
 
37
 
38
 ARMADILLO_REPO="https://git.postactiv.com/maiya/Armadillo"
38
 ARMADILLO_REPO="https://git.postactiv.com/maiya/Armadillo"
39
 ARMADILLO_COMMIT='ec3938a678f373156c4cbf37926c9a5ab68222c4'
39
 ARMADILLO_COMMIT='ec3938a678f373156c4cbf37926c9a5ab68222c4'
409
     npm install -g eslint-plugin-promise@3.5.0
409
     npm install -g eslint-plugin-promise@3.5.0
410
     npm install -g moment@2.18.1
410
     npm install -g moment@2.18.1
411
     npm install -g node-sass@4.5.2
411
     npm install -g node-sass@4.5.2
412
+    npm install -g whatwg-fetch@2.0.3
412
     yarn
413
     yarn
413
     if [ -f $INSTALL_DIR/pleroma/dist/index.html ]; then
414
     if [ -f $INSTALL_DIR/pleroma/dist/index.html ]; then
414
         rm -rf $INSTALL_DIR/pleroma/dist/*
415
         rm -rf $INSTALL_DIR/pleroma/dist/*
452
     if [ -d $INSTALL_DIR/pleroma ]; then
453
     if [ -d $INSTALL_DIR/pleroma ]; then
453
         set_repo_commit $INSTALL_DIR/pleroma "${app_name} pleroma commit" "$PLEROMA_COMMIT" $PLEROMA_REPO
454
         set_repo_commit $INSTALL_DIR/pleroma "${app_name} pleroma commit" "$PLEROMA_COMMIT" $PLEROMA_REPO
454
         cd $INSTALL_DIR/pleroma
455
         cd $INSTALL_DIR/pleroma
456
+        yarn
455
         npm run build
457
         npm run build
456
         if [ ! -d $INSTALL_DIR/pleroma/dist ]; then
458
         if [ ! -d $INSTALL_DIR/pleroma/dist ]; then
457
             echo 'Unable to build pleroma'
459
             echo 'Unable to build pleroma'