Parcourir la source

Peg zeronet blog to a commit

Bob Mottram il y a 9 ans
Parent
révision
f1b38ac5fc
1 fichiers modifiés avec 36 ajouts et 2 suppressions
  1. 36
    2
      src/freedombone

+ 36
- 2
src/freedombone Voir le fichier

446
 ZERONET_REPO='https://github.com/HelloZeroNet/ZeroNet.git'
446
 ZERONET_REPO='https://github.com/HelloZeroNet/ZeroNet.git'
447
 ZERONET_COMMIT='675bd462556c541d65e2d95f91f899146a373aad'
447
 ZERONET_COMMIT='675bd462556c541d65e2d95f91f899146a373aad'
448
 ZERONET_BLOG_REPO='https://github.com/HelloZeroNet/ZeroBlog'
448
 ZERONET_BLOG_REPO='https://github.com/HelloZeroNet/ZeroBlog'
449
+ZERONET_BLOG_COMMIT='bbb0d6c36465fed2e6df71f1aab45fcc9c6ad609'
449
 ZERONET_FORUM_REPO='https://github.com/HelloZeroNet/ZeroTalk'
450
 ZERONET_FORUM_REPO='https://github.com/HelloZeroNet/ZeroTalk'
451
+ZERONET_FORUM_COMMIT='e2d2c9cb1cfbfef91b244935efb5c14c2ad95faa'
450
 ZERONET_URL=http://127.0.0.1:43110
452
 ZERONET_URL=http://127.0.0.1:43110
451
 ZERONET_PORT=15441
453
 ZERONET_PORT=15441
452
 TRACKER_PORT=6969
454
 TRACKER_PORT=6969
891
       if grep -q "IPFS_COMMIT" $CONFIGURATION_FILE; then
893
       if grep -q "IPFS_COMMIT" $CONFIGURATION_FILE; then
892
           IPFS_COMMIT=$(grep "IPFS_COMMIT" $CONFIGURATION_FILE | awk -F '=' '{print $2}')
894
           IPFS_COMMIT=$(grep "IPFS_COMMIT" $CONFIGURATION_FILE | awk -F '=' '{print $2}')
893
       fi
895
       fi
896
+      if grep -q "ZERONET_BLOG_COMMIT" $CONFIGURATION_FILE; then
897
+          ZERONET_BLOG_COMMIT=$(grep "ZERONET_BLOG_COMMIT" $CONFIGURATION_FILE | awk -F '=' '{print $2}')
898
+      fi
899
+      if grep -q "ZERONET_FORUM_COMMIT" $CONFIGURATION_FILE; then
900
+          ZERONET_FORUM_COMMIT=$(grep "ZERONET_FORUM_COMMIT" $CONFIGURATION_FILE | awk -F '=' '{print $2}')
901
+      fi
894
       if grep -q "GNUSOCIAL_COMMIT" $CONFIGURATION_FILE; then
902
       if grep -q "GNUSOCIAL_COMMIT" $CONFIGURATION_FILE; then
895
           GNUSOCIAL_COMMIT=$(grep "GNUSOCIAL_COMMIT" $CONFIGURATION_FILE | awk -F '=' '{print $2}')
903
           GNUSOCIAL_COMMIT=$(grep "GNUSOCIAL_COMMIT" $CONFIGURATION_FILE | awk -F '=' '{print $2}')
896
       fi
904
       fi
1839
       return
1847
       return
1840
   fi
1848
   fi
1841
 
1849
 
1850
+  if [ -d /opt/zeronet/ZeroBlog ]; then
1851
+      if grep -q "ZeroNet Blog commit" $COMPLETION_FILE; then
1852
+          CURRENT_ZERONET_BLOG_COMMIT=$(grep "ZeroNet Blog commit" $COMPLETION_FILE | awk -F ':' '{print $2}')
1853
+          if [[ "$CURRENT_ZERONET_BLOG_COMMIT" != "$ZERONET_BLOG_COMMIT" ]]; then
1854
+              cd /opt/zeronet/ZeroBlog
1855
+              git stash
1856
+              git checkout master
1857
+              git pull
1858
+              git checkout $ZERONET_BLOG_COMMIT
1859
+              git checkout -b $ZERONET_BLOG_COMMIT
1860
+              sed -i "s/ZeroNet Blog commit.*/ZeroNet Blog commit:$ZERONET_BLOG_COMMIT/g" $COMPLETION_FILE
1861
+          fi
1862
+      else
1863
+          echo "ZeroNet Blog commit:$ZERONET_BLOG_COMMIT" >> $COMPLETION_FILE
1864
+      fi
1865
+  fi
1866
+
1842
   if grep -Fxq "install_zeronet_blog" $COMPLETION_FILE; then
1867
   if grep -Fxq "install_zeronet_blog" $COMPLETION_FILE; then
1843
       return
1868
       return
1844
   fi
1869
   fi
1893
       echo 'ZeroBlog repo could not be cloned'
1918
       echo 'ZeroBlog repo could not be cloned'
1894
       exit 6739
1919
       exit 6739
1895
   fi
1920
   fi
1921
+  cd /opt/zeronet/ZeroBlog
1922
+  git checkout $ZERONET_BLOG_COMMIT
1923
+  git checkout -b $ZERONET_BLOG_COMMIT
1924
+  if ! grep -q "ZeroNet Blog commit" $COMPLETION_FILE; then
1925
+      echo "ZeroNet Blog commit:$ZERONET_BLOG_COMMIT" >> $COMPLETION_FILE
1926
+  else
1927
+      sed -i "s/ZeroNet Blog commit.*/ZeroNet Blog commit:$ZERONET_BLOG_COMMIT/g" $COMPLETION_FILE
1928
+  fi
1929
+
1896
   echo $"ZeroNet Blog address:     $ZERONET_BLOG_ADDRESS"
1930
   echo $"ZeroNet Blog address:     $ZERONET_BLOG_ADDRESS"
1897
   echo $"ZeroNet Blog private key: $ZERONET_BLOG_PRIVATE_KEY"
1931
   echo $"ZeroNet Blog private key: $ZERONET_BLOG_PRIVATE_KEY"
1898
   cp -r /opt/zeronet/ZeroBlog/* /opt/zeronet/data/$ZERONET_BLOG_ADDRESS
1932
   cp -r /opt/zeronet/ZeroBlog/* /opt/zeronet/data/$ZERONET_BLOG_ADDRESS
8090
               cp $INSTALL_DIR/cleanup-maildir/cleanup-maildir /usr/bin
8124
               cp $INSTALL_DIR/cleanup-maildir/cleanup-maildir /usr/bin
8091
           fi
8125
           fi
8092
       else
8126
       else
8093
-          echo "cleanup-maildir commit:$GNUSOCIAL_COMMIT" >> $COMPLETION_FILE
8127
+          echo "cleanup-maildir commit:$CLEANUP_MAILDIR_COMMIT" >> $COMPLETION_FILE
8094
       fi
8128
       fi
8095
   fi
8129
   fi
8096
 
8130
 
8388
   # update to the next commit
8422
   # update to the next commit
8389
   if [ -d $INSTALL_DIR/nginx_ensite ]; then
8423
   if [ -d $INSTALL_DIR/nginx_ensite ]; then
8390
       if grep -q "Nginx-ensite commit" $COMPLETION_FILE; then
8424
       if grep -q "Nginx-ensite commit" $COMPLETION_FILE; then
8391
-          CURRENT_GNUSOCIAL_COMMIT=$(grep "Nginx-ensite commit" $COMPLETION_FILE | awk -F ':' '{print $2}')
8425
+          CURRENT_NGINX_ENSITE_COMMIT=$(grep "Nginx-ensite commit" $COMPLETION_FILE | awk -F ':' '{print $2}')
8392
           if [[ "$CURRENT_NGINX_ENSITE_COMMIT" != "$NGINX_ENSITE_COMMIT" ]]; then
8426
           if [[ "$CURRENT_NGINX_ENSITE_COMMIT" != "$NGINX_ENSITE_COMMIT" ]]; then
8393
               cd /var/www/$MICROBLOG_DOMAIN_NAME/htdocs
8427
               cd /var/www/$MICROBLOG_DOMAIN_NAME/htdocs
8394
               git stash
8428
               git stash