From 7dc4faa97ed2021981c69551d2af9a68787e867d Mon Sep 17 00:00:00 2001 From: Kenneth Heafield Date: Tue, 19 Mar 2013 11:17:17 +0000 Subject: [PATCH] Fix cd error when running bjam from non-top --- bjam | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/bjam b/bjam index d0d94dedb..0ebf105c3 100755 --- a/bjam +++ b/bjam @@ -1,17 +1,17 @@ #!/bin/bash set -e +top="$(dirname "$0")" if bjam="$(which bjam 2>/dev/null)" && #exists [ ${#bjam} != 0 ] && #paranoia about which printing nothing then returning true ! grep UFIHGUFIHBDJKNCFZXAEVA "${bjam}" /dev/null && #bjam in path isn't this script "${bjam}" --sanity-test 2>/dev/null |grep Sane >/dev/null && #The test in jam-files/sanity.jam passes - (cd jam-files/fail && ! "${bjam}") >/dev/null #Returns non-zero on failure + (cd "${top}/jam-files/fail" && ! "${bjam}") >/dev/null #Returns non-zero on failure then #Delegate to system bjam exec "${bjam}" "$@" fi -top="$(dirname "$0")" if [ ! -x "$top"/jam-files/bjam ] || "$top"/jam-files/bjam -v |grep 2011.4 >/dev/null; then pushd "$top/jam-files/engine" ./build.sh