ecrist@cartman:~/openvpn-devel-src-> diff bootstrap.sh openvpn-devel/bootstrap.sh
16,17c16,17
<     /usr/local/bin/git checkout master 2> /dev/null
<     /usr/local/bin/git branch -D ${GIT_BRANCH}
---
>     git checkout master 2> /dev/null
>     git branch -D ${GIT_BRANCH}
22c22
< /usr/local/bin/git checkout -b ${GIT_BRANCH} ${GIT_REMOTEBRANCH}
---
> git checkout -b ${GIT_BRANCH} ${GIT_REMOTEBRANCH}
25c25
< GIT_REV=$(/usr/local/bin/git rev-list ${GIT_BRANCH} -1 | cut -b-12)
---
> GIT_REV=$(git rev-list ${GIT_BRANCH} -1 | cut -b-12)
30,32c30,32
< GIT_VERSIONM4=$(/usr/local/bin/git ls-tree master version.m4 | awk '{print $3}')
< /usr/local/bin/git cat-file blob ${GIT_VERSIONM4} | \
<     /usr/bin/sed "s#define(PRODUCT_VERSION,\[.*\])#define\(PRODUCT_VERSION,\[testing-${GIT_REV}]\)\]#" > version.m4
---
> GIT_VERSIONM4=$(git ls-tree master version.m4 | awk '{print $3}')
> git cat-file blob ${GIT_VERSIONM4} | \
>     sed "s#define(PRODUCT_VERSION,\[.*\])#define\(PRODUCT_VERSION,\[testing-${GIT_REV}]\)\]#" > version.m4
36c36
< /usr/local/bin/autoreconf -i
---
> autoreconf -i