diff options
| author | md_5 <[email protected]> | 2013-01-21 20:24:30 +1100 |
|---|---|---|
| committer | md_5 <[email protected]> | 2013-01-21 20:24:30 +1100 |
| commit | f440cb30ed96400465555db52cad8d22d91555f5 (patch) | |
| tree | a30be46ca5179ec1bf46e726f911f0ea3d9b430a /upstreamMerge.sh | |
| parent | 7dcc1ceac4210d40513d09856f8af5f202756e17 (diff) | |
| download | Paper-f440cb30ed96400465555db52cad8d22d91555f5.tar.gz Paper-f440cb30ed96400465555db52cad8d22d91555f5.zip | |
Switch to pwd so the scripts can work more reliably on other OSs
Diffstat (limited to 'upstreamMerge.sh')
| -rwxr-xr-x | upstreamMerge.sh | 2 |
1 files changed, 1 insertions, 1 deletions
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 |