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

Peg toxcore/toxic to a specific commit

Bob Mottram пре 9 година
родитељ
комит
1d2a72451d
1 измењених фајлова са 69 додато и 18 уклоњено
  1. 69
    18
      src/freedombone

+ 69
- 18
src/freedombone Прегледај датотеку

410
 
410
 
411
 TOX_PORT=33445
411
 TOX_PORT=33445
412
 TOX_REPO='git://github.com/irungentoo/toxcore.git'
412
 TOX_REPO='git://github.com/irungentoo/toxcore.git'
413
+TOX_COMMIT='73b2144edcfd1ca617e9054479b66ab0c0361a14'
413
 TOX_BOOTSTRAP_ID_FILE=/var/lib/tox-bootstrapd/pubkey.txt
414
 TOX_BOOTSTRAP_ID_FILE=/var/lib/tox-bootstrapd/pubkey.txt
414
 # These are some default nodes, but you can replace them with trusted nodes
415
 # These are some default nodes, but you can replace them with trusted nodes
415
 # as you prefer. See https://wiki.tox.im/Nodes
416
 # as you prefer. See https://wiki.tox.im/Nodes
418
 #  '192.254.75.102,2607:5600:284::2,33445,951C88B7E75C867418ACDB5D273821372BB5BD652740BCDF623A4FA293E75D2F,Tox RELENG,US'
419
 #  '192.254.75.102,2607:5600:284::2,33445,951C88B7E75C867418ACDB5D273821372BB5BD652740BCDF623A4FA293E75D2F,Tox RELENG,US'
419
 #  '144.76.60.215,2a01:4f8:191:64d6::1,33445,04119E835DF3E78BACF0F84235B300546AF8B936F035185E2A8E9E0A67C8924F,sonOfRa,DE'
420
 #  '144.76.60.215,2a01:4f8:191:64d6::1,33445,04119E835DF3E78BACF0F84235B300546AF8B936F035185E2A8E9E0A67C8924F,sonOfRa,DE'
420
 #)
421
 #)
422
+TOXIC_REPO="https://github.com/Tox/toxic"
423
+TOXIC_COMMIT='88270827a96b2082e254677f35585ed24581a42c'
421
 
424
 
422
 #ZERONET_REPO='https://github.com/HelloZeroNet/ZeroNet.git'
425
 #ZERONET_REPO='https://github.com/HelloZeroNet/ZeroNet.git'
423
 ZERONET_REPO='https://github.com/HelloZeroNet/ZeroNet.git'
426
 ZERONET_REPO='https://github.com/HelloZeroNet/ZeroNet.git'
811
       if grep -q "GOGS_COMMIT" $CONFIGURATION_FILE; then
814
       if grep -q "GOGS_COMMIT" $CONFIGURATION_FILE; then
812
           GOGS_COMMIT=$(grep "GOGS_COMMIT" $CONFIGURATION_FILE | awk -F '=' '{print $2}')
815
           GOGS_COMMIT=$(grep "GOGS_COMMIT" $CONFIGURATION_FILE | awk -F '=' '{print $2}')
813
       fi
816
       fi
817
+      if grep -q "TOX_COMMIT" $CONFIGURATION_FILE; then
818
+          TOX_COMMIT=$(grep "TOX_COMMIT" $CONFIGURATION_FILE | awk -F '=' '{print $2}')
819
+      fi
820
+      if grep -q "TOXIC_COMMIT" $CONFIGURATION_FILE; then
821
+          TOXIC_COMMIT=$(grep "TOXIC_COMMIT" $CONFIGURATION_FILE | awk -F '=' '{print $2}')
822
+      fi
814
       if grep -q "HUBZILLA_COMMIT" $CONFIGURATION_FILE; then
823
       if grep -q "HUBZILLA_COMMIT" $CONFIGURATION_FILE; then
815
           HUBZILLA_COMMIT=$(grep "HUBZILLA_COMMIT" $CONFIGURATION_FILE | awk -F '=' '{print $2}')
824
           HUBZILLA_COMMIT=$(grep "HUBZILLA_COMMIT" $CONFIGURATION_FILE | awk -F '=' '{print $2}')
816
       fi
825
       fi
9084
   if [[ $SYSTEM_TYPE == "$VARIANT_WRITER" || $SYSTEM_TYPE == "$VARIANT_MAILBOX" || $SYSTEM_TYPE == "$VARIANT_CLOUD" || $SYSTEM_TYPE == "$VARIANT_SOCIAL" || $SYSTEM_TYPE == "$VARIANT_MEDIA" || $SYSTEM_TYPE == "$VARIANT_DEVELOPER" ]]; then
9093
   if [[ $SYSTEM_TYPE == "$VARIANT_WRITER" || $SYSTEM_TYPE == "$VARIANT_MAILBOX" || $SYSTEM_TYPE == "$VARIANT_CLOUD" || $SYSTEM_TYPE == "$VARIANT_SOCIAL" || $SYSTEM_TYPE == "$VARIANT_MEDIA" || $SYSTEM_TYPE == "$VARIANT_DEVELOPER" ]]; then
9085
       return
9094
       return
9086
   fi
9095
   fi
9096
+
9097
+  # update to the next commit
9098
+  if [ -d $INSTALL_DIR/toxcore ]; then
9099
+      if grep -q "toxcore commit" $COMPLETION_FILE; then
9100
+          CURRENT_TOX_COMMIT=$(grep "toxcore commit" $COMPLETION_FILE | awk -F ':' '{print $2}')
9101
+          if [[ "$CURRENT_TOX_COMMIT" != "$TOX_COMMIT" ]]; then
9102
+              cd $INSTALL_DIR/toxcore
9103
+              git stash
9104
+              git checkout master
9105
+              git pull
9106
+              git checkout $TOX_COMMIT
9107
+              git branch -b $TOX_COMMIT
9108
+              sed -i "s/toxcore commit.*/toxcore commit:$TOX_COMMIT/g" $COMPLETION_FILE
9109
+              autoreconf -i
9110
+              ./configure --enable-daemon
9111
+              make
9112
+              make install
9113
+              systemctl restart tox-bootstrapd.service
9114
+          fi
9115
+      fi
9116
+  fi
9117
+
9087
   if grep -Fxq "install_tox_node" $COMPLETION_FILE; then
9118
   if grep -Fxq "install_tox_node" $COMPLETION_FILE; then
9088
       return
9119
       return
9089
   fi
9120
   fi
9097
   cd $INSTALL_DIR
9128
   cd $INSTALL_DIR
9098
   git clone $TOX_REPO
9129
   git clone $TOX_REPO
9099
   cd $INSTALL_DIR/toxcore
9130
   cd $INSTALL_DIR/toxcore
9131
+
9132
+  git checkout $TOX_COMMIT
9133
+  git branch -b $TOX_COMMIT
9134
+  if ! grep -q "toxcore commit" $COMPLETION_FILE; then
9135
+      echo "toxcore commit:$TOX_COMMIT" >> $COMPLETION_FILE
9136
+  else
9137
+      sed -i "s/toxcore commit.*/toxcore commit:$TOX_COMMIT/g" $COMPLETION_FILE
9138
+  fi
9139
+
9100
   autoreconf -i
9140
   autoreconf -i
9101
   ./configure --enable-daemon
9141
   ./configure --enable-daemon
9102
   if [ ! "$?" = "0" ]; then
9142
   if [ ! "$?" = "0" ]; then
9212
   if [[ $SYSTEM_TYPE == "$VARIANT_WRITER" || $SYSTEM_TYPE == "$VARIANT_MAILBOX" || $SYSTEM_TYPE == "$VARIANT_CLOUD" || $SYSTEM_TYPE == "$VARIANT_SOCIAL" || $SYSTEM_TYPE == "$VARIANT_MEDIA" || $SYSTEM_TYPE == "$VARIANT_DEVELOPER" ]]; then
9252
   if [[ $SYSTEM_TYPE == "$VARIANT_WRITER" || $SYSTEM_TYPE == "$VARIANT_MAILBOX" || $SYSTEM_TYPE == "$VARIANT_CLOUD" || $SYSTEM_TYPE == "$VARIANT_SOCIAL" || $SYSTEM_TYPE == "$VARIANT_MEDIA" || $SYSTEM_TYPE == "$VARIANT_DEVELOPER" ]]; then
9213
       return
9253
       return
9214
   fi
9254
   fi
9255
+
9256
+  # update to the next commit
9257
+  if [ -d $INSTALL_DIR/toxic ]; then
9258
+      if grep -q "Toxic commit" $COMPLETION_FILE; then
9259
+          CURRENT_TOXIC_COMMIT=$(grep "Toxic commit" $COMPLETION_FILE | awk -F ':' '{print $2}')
9260
+          if [[ "$CURRENT_TOXIC_COMMIT" != "$TOXIC_COMMIT" ]]; then
9261
+              cd $INSTALL_DIR/toxic
9262
+              git stash
9263
+              git checkout master
9264
+              git pull
9265
+              git checkout $TOXIC_COMMIT
9266
+              git branch -b $TOXIC_COMMIT
9267
+              sed -i "s/Toxic commit.*/Toxic commit:$TOXIC_COMMIT/g" $COMPLETION_FILE
9268
+              make
9269
+              make install
9270
+          fi
9271
+      fi
9272
+  fi
9273
+
9215
   if grep -Fxq "install_tox_client" $COMPLETION_FILE; then
9274
   if grep -Fxq "install_tox_client" $COMPLETION_FILE; then
9216
       return
9275
       return
9217
   fi
9276
   fi
9277
+
9218
   apt-get -y install libncursesw5-dev libconfig-dev libqrencode-dev libcurl4-openssl-dev
9278
   apt-get -y install libncursesw5-dev libconfig-dev libqrencode-dev libcurl4-openssl-dev
9219
 
9279
 
9220
   cd $INSTALL_DIR
9280
   cd $INSTALL_DIR
9221
-  git clone https://github.com/Tox/toxic
9281
+  git clone $TOXIC_REPO
9222
   cd $INSTALL_DIR/toxic
9282
   cd $INSTALL_DIR/toxic
9283
+  git checkout $TOXIC_COMMIT
9284
+  git branch -b $TOXIC_COMMIT
9285
+  if ! grep -q "Toxic commit" $COMPLETION_FILE; then
9286
+      echo "Toxic commit:$TOXIC_COMMIT" >> $COMPLETION_FILE
9287
+  else
9288
+      sed -i "s/Toxic commit.*/Toxic commit:$TOXIC_COMMIT/g" $COMPLETION_FILE
9289
+  fi
9290
+
9223
   make
9291
   make
9224
   if [ ! -f $INSTALL_DIR/toxic/build/toxic ]; then
9292
   if [ ! -f $INSTALL_DIR/toxic/build/toxic ]; then
9225
       exit 74872
9293
       exit 74872
10920
   echo '  systemctl daemon-reload' >> /etc/cron.weekly/$UPGRADE_SCRIPT_NAME
10988
   echo '  systemctl daemon-reload' >> /etc/cron.weekly/$UPGRADE_SCRIPT_NAME
10921
   echo 'fi' >> /etc/cron.weekly/$UPGRADE_SCRIPT_NAME
10989
   echo 'fi' >> /etc/cron.weekly/$UPGRADE_SCRIPT_NAME
10922
   echo '' >> /etc/cron.weekly/$UPGRADE_SCRIPT_NAME
10990
   echo '' >> /etc/cron.weekly/$UPGRADE_SCRIPT_NAME
10923
-  echo '# update tox node' >> /etc/cron.weekly/$UPGRADE_SCRIPT_NAME
10924
-  echo "if [ -d $INSTALL_DIR/toxcore ]; then" >> /etc/cron.weekly/$UPGRADE_SCRIPT_NAME
10925
-  echo "  cd $INSTALL_DIR/toxcore" >> /etc/cron.weekly/$UPGRADE_SCRIPT_NAME
10926
-  echo '  git stash' >> /etc/cron.weekly/$UPGRADE_SCRIPT_NAME
10927
-  echo '  git pull' >> /etc/cron.weekly/$UPGRADE_SCRIPT_NAME
10928
-  echo '  autoreconf -i' >> /etc/cron.weekly/$UPGRADE_SCRIPT_NAME
10929
-  echo '  ./configure --enable-daemon' >> /etc/cron.weekly/$UPGRADE_SCRIPT_NAME
10930
-  echo '  make' >> /etc/cron.weekly/$UPGRADE_SCRIPT_NAME
10931
-  echo '  make install' >> /etc/cron.weekly/$UPGRADE_SCRIPT_NAME
10932
-  echo '  systemctl restart tox-bootstrapd.service' >> /etc/cron.weekly/$UPGRADE_SCRIPT_NAME
10933
-  echo "  cd $INSTALL_DIR/toxic" >> /etc/cron.weekly/$UPGRADE_SCRIPT_NAME
10934
-  echo '  git stash' >> /etc/cron.weekly/$UPGRADE_SCRIPT_NAME
10935
-  echo '  git pull' >> /etc/cron.weekly/$UPGRADE_SCRIPT_NAME
10936
-  echo '  make' >> /etc/cron.weekly/$UPGRADE_SCRIPT_NAME
10937
-  echo '  make install' >> /etc/cron.weekly/$UPGRADE_SCRIPT_NAME
10938
-  echo 'fi' >> /etc/cron.weekly/$UPGRADE_SCRIPT_NAME
10939
-  echo '' >> /etc/cron.weekly/$UPGRADE_SCRIPT_NAME
10940
   echo '# update email encryption script' >> /etc/cron.weekly/$UPGRADE_SCRIPT_NAME
10991
   echo '# update email encryption script' >> /etc/cron.weekly/$UPGRADE_SCRIPT_NAME
10941
   echo "if [ -d $INSTALL_DIR/gpgit ]; then" >> /etc/cron.weekly/$UPGRADE_SCRIPT_NAME
10992
   echo "if [ -d $INSTALL_DIR/gpgit ]; then" >> /etc/cron.weekly/$UPGRADE_SCRIPT_NAME
10942
   echo "  cd $INSTALL_DIR/gpgit" >> /etc/cron.weekly/$UPGRADE_SCRIPT_NAME
10993
   echo "  cd $INSTALL_DIR/gpgit" >> /etc/cron.weekly/$UPGRADE_SCRIPT_NAME