Kaynağa Gözat

Peg gpgit to a specific commit

Bob Mottram 9 yıl önce
ebeveyn
işleme
e069f941c5
1 değiştirilmiş dosya ile 40 ekleme ve 10 silme
  1. 40
    10
      src/freedombone

+ 40
- 10
src/freedombone Dosyayı Görüntüle

437
 IPFS_COMMIT='20b06a4cbce8884f5b194da6e98cb11f2c77f166'
437
 IPFS_COMMIT='20b06a4cbce8884f5b194da6e98cb11f2c77f166'
438
 IPFS_PORT=4001
438
 IPFS_PORT=4001
439
 
439
 
440
+GPGIT_REPO="https://github.com/mikecardwell/gpgit"
441
+GPGIT_COMMIT='583dc76119f19420f8a33f606744faa7c8922738'
442
+
440
 # Default diffie-hellman key length in bits
443
 # Default diffie-hellman key length in bits
441
 DH_KEYLENGTH=2048
444
 DH_KEYLENGTH=2048
442
 
445
 
823
       if grep -q "TOXIC_COMMIT" $CONFIGURATION_FILE; then
826
       if grep -q "TOXIC_COMMIT" $CONFIGURATION_FILE; then
824
           TOXIC_COMMIT=$(grep "TOXIC_COMMIT" $CONFIGURATION_FILE | awk -F '=' '{print $2}')
827
           TOXIC_COMMIT=$(grep "TOXIC_COMMIT" $CONFIGURATION_FILE | awk -F '=' '{print $2}')
825
       fi
828
       fi
829
+      if grep -q "GPGIT_REPO" $CONFIGURATION_FILE; then
830
+          GPGIT_REPO=$(grep "GPGIT_REPO" $CONFIGURATION_FILE | awk -F '=' '{print $2}')
831
+      fi
832
+      if grep -q "GPGIT_COMMIT" $CONFIGURATION_FILE; then
833
+          GPGIT_COMMIT=$(grep "GPGIT_COMMIT" $CONFIGURATION_FILE | awk -F '=' '{print $2}')
834
+      fi
826
       if grep -q "HUBZILLA_COMMIT" $CONFIGURATION_FILE; then
835
       if grep -q "HUBZILLA_COMMIT" $CONFIGURATION_FILE; then
827
           HUBZILLA_COMMIT=$(grep "HUBZILLA_COMMIT" $CONFIGURATION_FILE | awk -F '=' '{print $2}')
836
           HUBZILLA_COMMIT=$(grep "HUBZILLA_COMMIT" $CONFIGURATION_FILE | awk -F '=' '{print $2}')
828
       fi
837
       fi
7581
   if [[ $SYSTEM_TYPE == "$VARIANT_CHAT" || $SYSTEM_TYPE == "$VARIANT_MEDIA" || $SYSTEM_TYPE == "$VARIANT_NONMAILBOX" || $SYSTEM_TYPE == "$VARIANT_MESH" ]]; then
7590
   if [[ $SYSTEM_TYPE == "$VARIANT_CHAT" || $SYSTEM_TYPE == "$VARIANT_MEDIA" || $SYSTEM_TYPE == "$VARIANT_NONMAILBOX" || $SYSTEM_TYPE == "$VARIANT_MESH" ]]; then
7582
       return
7591
       return
7583
   fi
7592
   fi
7593
+
7594
+  # update to the next commit
7595
+  if [ -f /usr/bin/gpgit.pl ]; then
7596
+      if grep -q "gpgit commit" $COMPLETION_FILE; then
7597
+          CURRENT_GPGIT_COMMIT=$(grep "gpgit commit" $COMPLETION_FILE | awk -F ':' '{print $2}')
7598
+          if [[ "$CURRENT_GPGIT_COMMIT" != "$GPGIT_COMMIT" ]]; then
7599
+              cd $INSTALL_DIR/gpgit
7600
+              git stash
7601
+              git checkout master
7602
+              git pull
7603
+              git checkout $GPGIT_COMMIT
7604
+              git branch -b $GPGIT_COMMIT
7605
+              sed -i "s/gpgit commit.*/gpgit commit:$GPGIT_COMMIT/g" $COMPLETION_FILE
7606
+              cp gpgit.pl /usr/bin/gpgit.pl
7607
+          fi
7608
+      else
7609
+          echo "gpgit commit:$GPGIT_COMMIT" >> $COMPLETION_FILE
7610
+      fi
7611
+  fi
7612
+
7584
   if grep -Fxq "encrypt_incoming_email" $COMPLETION_FILE; then
7613
   if grep -Fxq "encrypt_incoming_email" $COMPLETION_FILE; then
7585
       return
7614
       return
7586
   fi
7615
   fi
7616
+
7587
   if [[ $GPG_ENCRYPT_STORED_EMAIL != "yes" ]]; then
7617
   if [[ $GPG_ENCRYPT_STORED_EMAIL != "yes" ]]; then
7588
       return
7618
       return
7589
   fi
7619
   fi
7620
+
7590
   if [ ! -f /usr/bin/gpgit.pl ]; then
7621
   if [ ! -f /usr/bin/gpgit.pl ]; then
7591
       apt-get -y install git libmail-gnupg-perl
7622
       apt-get -y install git libmail-gnupg-perl
7592
       cd $INSTALL_DIR
7623
       cd $INSTALL_DIR
7593
-      git clone https://github.com/mikecardwell/gpgit
7594
-      cd gpgit
7624
+      git clone $GPGIT_REPO
7625
+      cd $INSTALL_DIR/gpgit
7626
+      git checkout $GPGIT_COMMIT
7627
+      git branch -b $GPGIT_COMMIT
7628
+      if ! grep -q "gpgit commit" $COMPLETION_FILE; then
7629
+          echo "gpgit commit:$GPGIT_COMMIT" >> $COMPLETION_FILE
7630
+      else
7631
+          sed -i "s/gpgit commit.*/gpgit commit:$GPGIT_COMMIT/g" $COMPLETION_FILE
7632
+      fi
7595
       cp gpgit.pl /usr/bin
7633
       cp gpgit.pl /usr/bin
7596
   fi
7634
   fi
7597
 
7635
 
10985
   echo '  git pull' >> /etc/cron.weekly/$UPGRADE_SCRIPT_NAME
11023
   echo '  git pull' >> /etc/cron.weekly/$UPGRADE_SCRIPT_NAME
10986
   echo "fi" >> /etc/cron.weekly/$UPGRADE_SCRIPT_NAME
11024
   echo "fi" >> /etc/cron.weekly/$UPGRADE_SCRIPT_NAME
10987
   echo '' >> /etc/cron.weekly/$UPGRADE_SCRIPT_NAME
11025
   echo '' >> /etc/cron.weekly/$UPGRADE_SCRIPT_NAME
10988
-  echo '# update email encryption script' >> /etc/cron.weekly/$UPGRADE_SCRIPT_NAME
10989
-  echo "if [ -d $INSTALL_DIR/gpgit ]; then" >> /etc/cron.weekly/$UPGRADE_SCRIPT_NAME
10990
-  echo "  cd $INSTALL_DIR/gpgit" >> /etc/cron.weekly/$UPGRADE_SCRIPT_NAME
10991
-  echo '  git stash' >> /etc/cron.weekly/$UPGRADE_SCRIPT_NAME
10992
-  echo '  git pull' >> /etc/cron.weekly/$UPGRADE_SCRIPT_NAME
10993
-  echo '  cp gpgit.pl /usr/bin' >> /etc/cron.weekly/$UPGRADE_SCRIPT_NAME
10994
-  echo 'fi' >> /etc/cron.weekly/$UPGRADE_SCRIPT_NAME
10995
-  echo '' >> /etc/cron.weekly/$UPGRADE_SCRIPT_NAME
10996
   echo "echo '
11026
   echo "echo '
10997
 
11027
 
10998
 ' | reset-tripwire" >> /etc/cron.weekly/$UPGRADE_SCRIPT_NAME
11028
 ' | reset-tripwire" >> /etc/cron.weekly/$UPGRADE_SCRIPT_NAME