From f440cb30ed96400465555db52cad8d22d91555f5 Mon Sep 17 00:00:00 2001 From: md_5 Date: Mon, 21 Jan 2013 20:24:30 +1100 Subject: [PATCH] Switch to pwd so the scripts can work more reliably on other OSs --- applyPatches.sh | 2 +- rebuildPatches.sh | 2 +- upstreamMerge.sh | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/applyPatches.sh b/applyPatches.sh index b7055aa220..838d16a80c 100755 --- a/applyPatches.sh +++ b/applyPatches.sh @@ -1,6 +1,6 @@ #!/bin/bash -basedir=$(dirname $(readlink -f $0)) +basedir=`pwd` echo "Rebuilding Forked projects.... " function applyPatch { diff --git a/rebuildPatches.sh b/rebuildPatches.sh index d400ce10c7..d9f9399fe5 100755 --- a/rebuildPatches.sh +++ b/rebuildPatches.sh @@ -1,6 +1,6 @@ #!/bin/bash -basedir=$(dirname $(readlink -f $0)) +basedir=`pwd` echo "Rebuilding patch files from current fork state..." function cleanupPatches { cd $1 diff --git a/upstreamMerge.sh b/upstreamMerge.sh index 642527c95f..c472ae6805 100755 --- a/upstreamMerge.sh +++ b/upstreamMerge.sh @@ -1,5 +1,5 @@ #!/bin/bash -basedir=$(dirname $(readlink -f $0)) +basedir=`pwd` function update { cd $basedir/$1 git fetch && git reset --hard origin/master