浏览代码

Peg inadyn to a specific commit

Bob Mottram 9 年前
父节点
当前提交
2e0919c0d6
共有 1 个文件被更改,包括 43 次插入3 次删除
  1. 43
    3
      src/freedombone

+ 43
- 3
src/freedombone 查看文件

91
 DDNS_PASSWORD=
91
 DDNS_PASSWORD=
92
 CURRENT_DDNS_DOMAIN=
92
 CURRENT_DDNS_DOMAIN=
93
 
93
 
94
+INADYN_REPO="https://github.com/troglobit/inadyn"
95
+INADYN_COMMIT='880a0e34cb6874ec62bf2ce9755a30577c00aee7'
96
+
94
 # Minimum number of characters in a password
97
 # Minimum number of characters in a password
95
 MINIMUM_PASSWORD_LENGTH=10
98
 MINIMUM_PASSWORD_LENGTH=10
96
 
99
 
863
       if grep -q "GNUSOCIAL_COMMIT" $CONFIGURATION_FILE; then
866
       if grep -q "GNUSOCIAL_COMMIT" $CONFIGURATION_FILE; then
864
           GNUSOCIAL_COMMIT=$(grep "GNUSOCIAL_COMMIT" $CONFIGURATION_FILE | awk -F '=' '{print $2}')
867
           GNUSOCIAL_COMMIT=$(grep "GNUSOCIAL_COMMIT" $CONFIGURATION_FILE | awk -F '=' '{print $2}')
865
       fi
868
       fi
869
+      if grep -q "INADYN_REPO" $CONFIGURATION_FILE; then
870
+          INADYN_REPO=$(grep "INADYN_REPO" $CONFIGURATION_FILE | awk -F '=' '{print $2}')
871
+      fi
872
+      if grep -q "INADYN_COMMIT" $CONFIGURATION_FILE; then
873
+          INADYN_COMMIT=$(grep "INADYN_COMMIT" $CONFIGURATION_FILE | awk -F '=' '{print $2}')
874
+      fi
866
       if grep -q "GPG_KEYSERVER" $CONFIGURATION_FILE; then
875
       if grep -q "GPG_KEYSERVER" $CONFIGURATION_FILE; then
867
           GPG_KEYSERVER=$(grep "GPG_KEYSERVER" $CONFIGURATION_FILE | awk -F '=' '{print $2}')
876
           GPG_KEYSERVER=$(grep "GPG_KEYSERVER" $CONFIGURATION_FILE | awk -F '=' '{print $2}')
868
       fi
877
       fi
10248
               git pull
10257
               git pull
10249
               git checkout $GNUSOCIAL_COMMIT
10258
               git checkout $GNUSOCIAL_COMMIT
10250
               git branch -b $GNUSOCIAL_COMMIT
10259
               git branch -b $GNUSOCIAL_COMMIT
10251
-              sed -i "s/GNU Social commit.*/GNU Social commit:$HUBZILLA_COMMIT/g" $COMPLETION_FILE
10260
+              sed -i "s/GNU Social commit.*/GNU Social commit:$GNUSOCIAL_COMMIT/g" $COMPLETION_FILE
10252
               chown -R www-data:www-data /var/www/$MICROBLOG_DOMAIN_NAME/htdocs
10261
               chown -R www-data:www-data /var/www/$MICROBLOG_DOMAIN_NAME/htdocs
10253
           fi
10262
           fi
10254
       else
10263
       else
11346
   if [[ $SYSTEM_TYPE == "$VARIANT_MESH" ]]; then
11355
   if [[ $SYSTEM_TYPE == "$VARIANT_MESH" ]]; then
11347
       return
11356
       return
11348
   fi
11357
   fi
11358
+
11359
+  # update to the next commit
11360
+  if [ -d $INSTALL_DIR/inadyn ]; then
11361
+      if grep -q "inadyn commit" $COMPLETION_FILE; then
11362
+          CURRENT_INADYN_COMMIT=$(grep "inadyn commit" $COMPLETION_FILE | awk -F ':' '{print $2}')
11363
+          if [[ "$CURRENT_INADYN_COMMIT" != "$INADYN_COMMIT" ]]; then
11364
+              cd $INSTALL_DIR/inadyn
11365
+              git stash
11366
+              git checkout master
11367
+              git pull
11368
+              git checkout $INADYN_COMMIT
11369
+              git branch -b $INADYN_COMMIT
11370
+              sed -i "s/inadyn commit.*/inadyn commit:$INADYN_COMMIT/g" $COMPLETION_FILE
11371
+              ./configure
11372
+              USE_OPENSSL=1 make
11373
+              make install
11374
+              systemctl restart inadyn
11375
+          fi
11376
+      else
11377
+          echo "inadyn commit:$INADYN_COMMIT" >> $COMPLETION_FILE
11378
+      fi
11379
+  fi
11380
+
11349
   if grep -Fxq "install_dynamicdns" $COMPLETION_FILE; then
11381
   if grep -Fxq "install_dynamicdns" $COMPLETION_FILE; then
11350
       return
11382
       return
11351
   fi
11383
   fi
11355
   # being leaked
11387
   # being leaked
11356
 
11388
 
11357
   apt-get -y install build-essential curl libgnutls28-dev automake1.11
11389
   apt-get -y install build-essential curl libgnutls28-dev automake1.11
11358
-  git clone https://github.com/bashrc/inadyn $INSTALL_DIR/inadyn
11390
+  git clone $INADYN_REPO $INSTALL_DIR/inadyn
11359
   if [ ! -d $INSTALL_DIR/inadyn ]; then
11391
   if [ ! -d $INSTALL_DIR/inadyn ]; then
11360
       echo 'inadyn repo not cloned'
11392
       echo 'inadyn repo not cloned'
11361
       echo -n | openssl s_client -showcerts -connect github.com:443 -CApath /etc/ssl/certs
11393
       echo -n | openssl s_client -showcerts -connect github.com:443 -CApath /etc/ssl/certs
11362
       exit 6785
11394
       exit 6785
11363
   fi
11395
   fi
11364
   cd $INSTALL_DIR/inadyn
11396
   cd $INSTALL_DIR/inadyn
11397
+  git checkout $INADYN_COMMIT
11398
+  git branch -b $INADYN_COMMIT
11399
+  if ! grep -q "inadyn commit" $COMPLETION_FILE; then
11400
+      echo "inadyn commit:$INADYN_COMMIT" >> $COMPLETION_FILE
11401
+  else
11402
+      sed -i "s/inadyn commit.*/inadyn commit:$INADYN_COMMIT/g" $COMPLETION_FILE
11403
+  fi
11404
+
11365
   ./configure
11405
   ./configure
11366
   if [ ! "$?" = "0" ]; then
11406
   if [ ! "$?" = "0" ]; then
11367
       exit 74890
11407
       exit 74890
11399
   echo '[Install]' >> /etc/systemd/system/inadyn.service
11439
   echo '[Install]' >> /etc/systemd/system/inadyn.service
11400
   echo 'WantedBy=multi-user.target' >> /etc/systemd/system/inadyn.service
11440
   echo 'WantedBy=multi-user.target' >> /etc/systemd/system/inadyn.service
11401
   systemctl enable inadyn
11441
   systemctl enable inadyn
11402
-  systemctl restart inadyn
11442
+  systemctl start inadyn
11403
   systemctl daemon-reload
11443
   systemctl daemon-reload
11404
 
11444
 
11405
   echo 'install_dynamicdns' >> $COMPLETION_FILE
11445
   echo 'install_dynamicdns' >> $COMPLETION_FILE