diff options
| -rwxr-xr-x | third_party/update.sh | 4 | ||||
| -rwxr-xr-x | third_party/waf/update.sh | 39 |
2 files changed, 22 insertions, 21 deletions
diff --git a/third_party/update.sh b/third_party/update.sh index 7f3581a03e2..aa40184849b 100755 --- a/third_party/update.sh +++ b/third_party/update.sh @@ -3,10 +3,10 @@ # our source tree for users that don't have them installed on their system # Third party directory -THIRD_PARTY_DIR="`dirname $0`" +THIRD_PARTY_DIR="$(dirname $0)" # Library directory where projects live that haven't been migrated to # $THIRD_PARTY_DIR yet. -WORKDIR="`mktemp -d`" +WORKDIR="$(mktemp -d)" echo "Updating zlib..." git clone git://git.samba.org/third_party/zlib "$WORKDIR/zlib" diff --git a/third_party/waf/update.sh b/third_party/waf/update.sh index 1983ab0ca6e..45fbeec5eff 100755 --- a/third_party/waf/update.sh +++ b/third_party/waf/update.sh @@ -1,8 +1,8 @@ #!/bin/bash if [[ $# -lt 1 ]]; then - echo "Usage: update.sh VERSION" - exit 1 + echo "Usage: update.sh VERSION" + exit 1 fi WAF_VERSION="${1}" @@ -16,19 +16,21 @@ echo "GIT URL: ${WAF_GIT}" echo "WAF SAMBA DIR: ${WAF_SAMBA_DIR}" echo "WAF TMP DIR: ${WAF_TMPDIR}" -cleanup_tmpdir() { - popd 2>/dev/null || true - rm -rf "$WAF_TMPDIR" +cleanup_tmpdir() +{ + popd 2>/dev/null || true + rm -rf "$WAF_TMPDIR" } trap cleanup_tmpdir SIGINT -cleanup_and_exit() { - cleanup_tmpdir - if test "$1" = 0 -o -z "$1" ; then - exit 0 - else - exit "$1" - fi +cleanup_and_exit() +{ + cleanup_tmpdir + if test "$1" = 0 -o -z "$1"; then + exit 0 + else + exit "$1" + fi } # Checkout the git tree @@ -38,17 +40,16 @@ pushd "${WAF_TMPDIR}" || cleanup_and_exit 1 git clone "${WAF_GIT}" ret=$? if [ $ret -ne 0 ]; then - echo "ERROR: Failed to clone repository" - cleanup_and_exit 1 + echo "ERROR: Failed to clone repository" + cleanup_and_exit 1 fi - pushd waf || cleanup_and_exit 1 git checkout -b "waf-${WAF_VERSION}" "waf-${WAF_VERSION}" ret=$? if [ $ret -ne 0 ]; then - echo "ERROR: Failed to checkout waf-${WAF_VERSION} repository" - cleanup_and_exit 1 + echo "ERROR: Failed to checkout waf-${WAF_VERSION} repository" + cleanup_and_exit 1 fi popd || cleanup_and_exit 1 @@ -62,8 +63,8 @@ rm -rf waflib/ rsync -av "${WAF_TMPDIR}/waf/waflib" . ret=$? if [ $ret -ne 0 ]; then - echo "ERROR: Failed copy waflib" - cleanup_and_exit 1 + echo "ERROR: Failed copy waflib" + cleanup_and_exit 1 fi chmod -x waflib/Context.py |