Просмотр исходного кода

Peg gnusocial to a particular commit

Bob Mottram 9 лет назад
Родитель
Сommit
2a88ddc412
1 измененных файлов: 37 добавлений и 25 удалений
  1. 37
    25
      src/freedombone

+ 37
- 25
src/freedombone Просмотреть файл

151
 MICROBLOG_CODE=
151
 MICROBLOG_CODE=
152
 MICROBLOG_REPO="git://gitorious.org/social/mainline.git"
152
 MICROBLOG_REPO="git://gitorious.org/social/mainline.git"
153
 MICROBLOG_ADMIN_PASSWORD=
153
 MICROBLOG_ADMIN_PASSWORD=
154
+GNUSOCIAL_COMMIT='5b847eff120264c3e9571e8a939e6b3a30e68032'
154
 
155
 
155
 # Domain name for hubzilla installation
156
 # Domain name for hubzilla installation
156
 HUBZILLA_DOMAIN_NAME=
157
 HUBZILLA_DOMAIN_NAME=
799
       if grep -q "HUBZILLA_COMMIT" $CONFIGURATION_FILE; then
800
       if grep -q "HUBZILLA_COMMIT" $CONFIGURATION_FILE; then
800
           HUBZILLA_COMMIT=$(grep "HUBZILLA_COMMIT" $CONFIGURATION_FILE | awk -F '=' '{print $2}')
801
           HUBZILLA_COMMIT=$(grep "HUBZILLA_COMMIT" $CONFIGURATION_FILE | awk -F '=' '{print $2}')
801
       fi
802
       fi
803
+      if grep -q "GNUSOCIAL_COMMIT" $CONFIGURATION_FILE; then
804
+          GNUSOCIAL_COMMIT=$(grep "GNUSOCIAL_COMMIT" $CONFIGURATION_FILE | awk -F '=' '{print $2}')
805
+      fi
802
       if grep -q "GPG_KEYSERVER" $CONFIGURATION_FILE; then
806
       if grep -q "GPG_KEYSERVER" $CONFIGURATION_FILE; then
803
           GPG_KEYSERVER=$(grep "GPG_KEYSERVER" $CONFIGURATION_FILE | awk -F '=' '{print $2}')
807
           GPG_KEYSERVER=$(grep "GPG_KEYSERVER" $CONFIGURATION_FILE | awk -F '=' '{print $2}')
804
       fi
808
       fi
8552
   if [ ! $OWNCLOUD_ADMIN_PASSWORD ]; then
8556
   if [ ! $OWNCLOUD_ADMIN_PASSWORD ]; then
8553
       if [ -f $IMAGE_PASSWORD_FILE ]; then
8557
       if [ -f $IMAGE_PASSWORD_FILE ]; then
8554
           OWNCLOUD_ADMIN_PASSWORD="$(printf `cat $IMAGE_PASSWORD_FILE`)"
8558
           OWNCLOUD_ADMIN_PASSWORD="$(printf `cat $IMAGE_PASSWORD_FILE`)"
8555
-      else    
8559
+      else
8556
           OWNCLOUD_ADMIN_PASSWORD="$(openssl rand -base64 32)"
8560
           OWNCLOUD_ADMIN_PASSWORD="$(openssl rand -base64 32)"
8557
       fi
8561
       fi
8558
   fi
8562
   fi
9942
 }
9946
 }
9943
 
9947
 
9944
 function install_gnu_social {
9948
 function install_gnu_social {
9945
-  if grep -Fxq "install_gnu_social" $COMPLETION_FILE; then
9946
-      return
9947
-  fi
9948
   if [[ $SYSTEM_TYPE == "$VARIANT_CLOUD" || $SYSTEM_TYPE == "$VARIANT_MAILBOX" || $SYSTEM_TYPE == "$VARIANT_CHAT" || $SYSTEM_TYPE == "$VARIANT_WRITER" || $SYSTEM_TYPE == "$VARIANT_MEDIA" || $SYSTEM_TYPE == "$VARIANT_DEVELOPER" || $SYSTEM_TYPE == "$VARIANT_MESH" ]]; then
9949
   if [[ $SYSTEM_TYPE == "$VARIANT_CLOUD" || $SYSTEM_TYPE == "$VARIANT_MAILBOX" || $SYSTEM_TYPE == "$VARIANT_CHAT" || $SYSTEM_TYPE == "$VARIANT_WRITER" || $SYSTEM_TYPE == "$VARIANT_MEDIA" || $SYSTEM_TYPE == "$VARIANT_DEVELOPER" || $SYSTEM_TYPE == "$VARIANT_MESH" ]]; then
9949
       return
9950
       return
9950
   fi
9951
   fi
9953
       exit 7359
9954
       exit 7359
9954
   fi
9955
   fi
9955
 
9956
 
9957
+  # update to the next commit
9958
+  if [ -d /var/www/$HUBZILLA_DOMAIN_NAME/htdocs ]; then
9959
+      if grep -q "GNU Social commit" $COMPLETION_FILE; then
9960
+          CURRENT_GNUSOCIAL_COMMIT=$(grep "GNU Social commit" $COMPLETION_FILE | awk -F ':' '{print $2}')
9961
+          if [[ "$CURRENT_GNUSOCIAL_COMMIT" != "$GNUSOCIAL_COMMIT" ]]; then
9962
+              cd /var/www/$MICROBLOG_DOMAIN_NAME/htdocs
9963
+              git stash
9964
+              git checkout master
9965
+              git pull
9966
+              git checkout $GNUSOCIAL_COMMIT
9967
+              git branch -b $GNUSOCIAL_COMMIT
9968
+              sed -i "s/GNU Social commit.*/GNU Social commit:$HUBZILLA_COMMIT/g" $COMPLETION_FILE
9969
+              chown -R www-data:www-data /var/www/$MICROBLOG_DOMAIN_NAME/htdocs
9970
+          fi
9971
+      fi
9972
+  fi
9973
+
9974
+  if grep -Fxq "install_gnu_social" $COMPLETION_FILE; then
9975
+      return
9976
+  fi
9977
+
9978
+
9956
   install_mariadb
9979
   install_mariadb
9957
   get_mariadb_password
9980
   get_mariadb_password
9958
   repair_databases_script
9981
   repair_databases_script
9969
   cd $INSTALL_DIR
9992
   cd $INSTALL_DIR
9970
   git clone $MICROBLOG_REPO gnusocial
9993
   git clone $MICROBLOG_REPO gnusocial
9971
 
9994
 
9995
+  cd gnusocial
9996
+  git checkout $GNUSOCIAL_COMMIT
9997
+  git branch -b $GNUSOCIAL_COMMIT
9998
+  if ! grep -q "GNU Social commit" $COMPLETION_FILE; then
9999
+      echo "GNU Social commit:$GNUSOCIAL_COMMIT" >> $COMPLETION_FILE
10000
+  else
10001
+      sed -i "s/GNU Social commit.*/GNU Social commit:$GNUSOCIAL_COMMIT/g" $COMPLETION_FILE
10002
+  fi
10003
+
10004
+  cd $INSTALL_DIR
9972
   rm -rf /var/www/$MICROBLOG_DOMAIN_NAME/htdocs
10005
   rm -rf /var/www/$MICROBLOG_DOMAIN_NAME/htdocs
9973
   mv gnusocial /var/www/$MICROBLOG_DOMAIN_NAME/htdocs
10006
   mv gnusocial /var/www/$MICROBLOG_DOMAIN_NAME/htdocs
9974
   chmod a+w /var/www/$MICROBLOG_DOMAIN_NAME/htdocs
10007
   chmod a+w /var/www/$MICROBLOG_DOMAIN_NAME/htdocs
10770
   echo '' >> /etc/cron.weekly/$UPGRADE_SCRIPT_NAME
10803
   echo '' >> /etc/cron.weekly/$UPGRADE_SCRIPT_NAME
10771
   echo 'apt-get -y update' >> /etc/cron.weekly/$UPGRADE_SCRIPT_NAME
10804
   echo 'apt-get -y update' >> /etc/cron.weekly/$UPGRADE_SCRIPT_NAME
10772
   echo 'apt-get -y upgrade' >> /etc/cron.weekly/$UPGRADE_SCRIPT_NAME
10805
   echo 'apt-get -y upgrade' >> /etc/cron.weekly/$UPGRADE_SCRIPT_NAME
10773
-  echo "#if grep -Fxq \"install_hubzilla\" $COMPLETION_FILE; then" >> /etc/cron.weekly/$UPGRADE_SCRIPT_NAME
10774
-  echo '#  # Hubzilla' >> /etc/cron.weekly/$UPGRADE_SCRIPT_NAME
10775
-  echo "#  cd /var/www/$HUBZILLA_DOMAIN_NAME/htdocs" >> /etc/cron.weekly/$UPGRADE_SCRIPT_NAME
10776
-  echo '#  git stash' >> /etc/cron.weekly/$UPGRADE_SCRIPT_NAME
10777
-  echo '#  git stash drop' >> /etc/cron.weekly/$UPGRADE_SCRIPT_NAME
10778
-  echo '#  git pull' >> /etc/cron.weekly/$UPGRADE_SCRIPT_NAME
10779
-  echo "#  cd /var/www/$HUBZILLA_DOMAIN_NAME/htdocs/addon" >> /etc/cron.weekly/$UPGRADE_SCRIPT_NAME
10780
-  echo '#  git stash' >> /etc/cron.weekly/$UPGRADE_SCRIPT_NAME
10781
-  echo '#  git stash drop' >> /etc/cron.weekly/$UPGRADE_SCRIPT_NAME
10782
-  echo '#  git pull' >> /etc/cron.weekly/$UPGRADE_SCRIPT_NAME
10783
-  echo "#  chown -R www-data:www-data /var/www/$HUBZILLA_DOMAIN_NAME/htdocs" >> /etc/cron.weekly/$UPGRADE_SCRIPT_NAME
10784
-  echo '#fi' >> /etc/cron.weekly/$UPGRADE_SCRIPT_NAME
10785
-  echo '' >> /etc/cron.weekly/$UPGRADE_SCRIPT_NAME
10786
-  echo "if grep -Fxq \"install_gnu_social\" $COMPLETION_FILE; then" >> /etc/cron.weekly/$UPGRADE_SCRIPT_NAME
10787
-  echo '  # GNU Social' >> /etc/cron.weekly/$UPGRADE_SCRIPT_NAME
10788
-  echo "  cd /var/www/$MICROBLOG_DOMAIN_NAME/htdocs" >> /etc/cron.weekly/$UPGRADE_SCRIPT_NAME
10789
-  echo '  git stash' >> /etc/cron.weekly/$UPGRADE_SCRIPT_NAME
10790
-  echo '  git stash drop' >> /etc/cron.weekly/$UPGRADE_SCRIPT_NAME
10791
-  echo '  git pull' >> /etc/cron.weekly/$UPGRADE_SCRIPT_NAME
10792
-  echo "  chown -R www-data:www-data /var/www/$MICROBLOG_DOMAIN_NAME/htdocs" >> /etc/cron.weekly/$UPGRADE_SCRIPT_NAME
10793
-  echo 'fi' >> /etc/cron.weekly/$UPGRADE_SCRIPT_NAME
10794
   echo '' >> /etc/cron.weekly/$UPGRADE_SCRIPT_NAME
10806
   echo '' >> /etc/cron.weekly/$UPGRADE_SCRIPT_NAME
10795
   echo "if grep -Fxq \"install_blog\" $COMPLETION_FILE; then" >> /etc/cron.weekly/$UPGRADE_SCRIPT_NAME
10807
   echo "if grep -Fxq \"install_blog\" $COMPLETION_FILE; then" >> /etc/cron.weekly/$UPGRADE_SCRIPT_NAME
10796
   echo '  # Blog' >> /etc/cron.weekly/$UPGRADE_SCRIPT_NAME
10808
   echo '  # Blog' >> /etc/cron.weekly/$UPGRADE_SCRIPT_NAME