etc/agfw/autoproxy-gfwlist/fetch_and_merge.sh

   1 #!/usr/bin/env bash
   2
   3 # Fetches remote svn updates to local repository,
   4 # and then merge these update into local master branch and trunk branch.
   5 # Finally, push all local changes to GitHub.
   6
   7 # Exit immediately if a command exits with a non-zero status.
   8 # Print commands and their arguments as they are executed.
   9 set -ex
  10
  11 use_proxy=false
  12 if [ "$1" = "--proxy" ]; then
  13     use_proxy=true
  14 fi
  15
  16 if [ -z "$GFWLIST_HOME" ]; then
  17     GFWLIST_HOME=/Users/zhouji/projects/autoproxy-gfwlist
  18 fi
  19
  20 max_retry=5
  21 failure_idle=10
  22 proxy_duration=120
  23
  24 function fetch_svn_updates() {
  25     local i=0
  26     local ret=0
  27     while true; do
  28         i=`expr $i + 1`
  29         if $use_proxy ; then
  30             proxychains4 git svn fetch
  31         else
  32             git svn fetch
  33         fi
  34         ret=$?
  35         if [ $ret -eq 0 ]; then
  36             break
  37         elif [ $i -lt $max_retry ]; then
  38             sleep $failure_idle
  39         else
  40             break
  41         fi
  42     done
  43     return $ret
  44 }
  45
  46 cd "$GFWLIST_HOME"
  47
  48 git checkout master
  49
  50 if $use_proxy ; then
  51     ssh -D 7070 -f -p 22 gocalfco@gocalf.com sleep $proxy_duration
  52 fi
  53
  54 set +e
  55 if fetch_svn_updates; then
  56     :
  57 else
  58     exit $?
  59 fi
  60 set -e
  61
  62 git merge origin/trunk -m 'auto merge svn trunk branch'
  63
  64 git checkout trunk
  65 git merge --ff-only origin/trunk
  66
  67 git push --all
  68
  69 git checkout master