Unverified Commit 73546cb9 authored by boklm's avatar boklm
Browse files

Stop using 'readlink -f'

'readlink -f' doesn't work on OSX.
parent 20acc7dc
......@@ -9,7 +9,10 @@ cd bundle
tar xf $rootdir/[% c("input_files_by_name/tbb-testsuite-deps") %]
cat > set-env << 'EOF'
basedir="$(readlink -f ${BASH_SOURCE%/*})"
function abs_dir() {
(cd "$1" && echo "$(pwd)")
}
basedir="$(abs_dir ${BASH_SOURCE%/*})"
export PATH="$basedir/perl/bin:$basedir/ImageMagick/bin:$PATH"
export LD_LIBRARY_PATH="$basedir/ImageMagick/lib"
EOF
......
#!/bin/bash
set -e
bdir="$(readlink -f ${BASH_SOURCE%/*})"
function abs_dir() {
(cd "$1" && echo "$(pwd)")
}
bdir="$(abs_dir ${BASH_SOURCE%/*})"
[ -f "$bdir/bundle/set-env" ] && source "$bdir/bundle/set-env"
exec perl "$bdir/tbb-testsuite" "$@"
......@@ -4,7 +4,10 @@
# Returns 0 if no update to the bundle is required
set -e
bdir="$(readlink -f ${BASH_SOURCE%/*})"
function abs_dir() {
(cd "$1" && echo "$(pwd)")
}
bdir="$(abs_dir ${BASH_SOURCE%/*})"
cd "$bdir/.."
if ! [ -f ./bundle/bundle_version.txt ]
then
......
#!/bin/bash
set -e
bdir="$(readlink -f ${BASH_SOURCE%/*})"
function abs_dir() {
(cd "$1" && echo "$(pwd)")
}
bdir="$(abs_dir ${BASH_SOURCE%/*})"
"$bdir/tools/pull"
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment