diff options
| author | Neels Hofmeyr <neels@hofmeyr.de> | 2017-10-27 22:31:14 +0200 |
|---|---|---|
| committer | Neels Hofmeyr <neels@hofmeyr.de> | 2017-10-27 22:37:22 +0200 |
| commit | 7c5e34cba004837189c92ca015856a06288872e0 (patch) | |
| tree | e1a6d528a3c94e702bd67d23cf012cb38a04a55e /scripts/osmo-build-dep.sh | |
| parent | f42a1cfa501d67a0fa96def4a1ff352c2b214620 (diff) | |
osmo-build-dep: offload branch checkout to osmo-deps.sh
In osmo-deps.sh, add second arg $branch, and also name the first one (i.e.
$project). Use the passed branch or 'origin/master' by default.
In osmo-build-dep.sh, it's not necessary to do a second 'git rev-parse HEAD',
osmo-deps.sh already does it.
Change-Id: I598c41a12352acea6e49a321ad2f665f6ea07a44
Diffstat (limited to 'scripts/osmo-build-dep.sh')
| -rwxr-xr-x | scripts/osmo-build-dep.sh | 6 |
1 files changed, 1 insertions, 5 deletions
diff --git a/scripts/osmo-build-dep.sh b/scripts/osmo-build-dep.sh index 8104ba7..6e9ef86 100755 --- a/scripts/osmo-build-dep.sh +++ b/scripts/osmo-build-dep.sh @@ -40,12 +40,8 @@ set -x mkdir -p "$deps" cd "$deps" -osmo-deps.sh "$project" +osmo-deps.sh "$project" "$branch" cd "$project" -if [ -n "$branch" ]; then - git checkout "$branch" -fi -git rev-parse HEAD # log current HEAD autoreconf --install --force ./configure --prefix="$inst" $cfg |