You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@htrace.apache.org by cm...@apache.org on 2014/12/06 04:37:04 UTC
incubator-htrace git commit: HTRACE-11. gobuild.sh should not use
ldconfig if it doesn't exist (cmccabe)
Repository: incubator-htrace
Updated Branches:
refs/heads/master 5e90bce1b -> c4a0d5d4a
HTRACE-11. gobuild.sh should not use ldconfig if it doesn't exist (cmccabe)
Project: http://git-wip-us.apache.org/repos/asf/incubator-htrace/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-htrace/commit/c4a0d5d4
Tree: http://git-wip-us.apache.org/repos/asf/incubator-htrace/tree/c4a0d5d4
Diff: http://git-wip-us.apache.org/repos/asf/incubator-htrace/diff/c4a0d5d4
Branch: refs/heads/master
Commit: c4a0d5d4a5ea9a49b7f4a007bafcbe06ce3505f8
Parents: 5e90bce
Author: Colin Patrick Mccabe <cm...@cloudera.com>
Authored: Fri Dec 5 19:31:04 2014 -0800
Committer: Colin Patrick Mccabe <cm...@cloudera.com>
Committed: Fri Dec 5 19:31:04 2014 -0800
----------------------------------------------------------------------
htrace-core/src/go/gobuild.sh | 15 +++++++++------
1 file changed, 9 insertions(+), 6 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-htrace/blob/c4a0d5d4/htrace-core/src/go/gobuild.sh
----------------------------------------------------------------------
diff --git a/htrace-core/src/go/gobuild.sh b/htrace-core/src/go/gobuild.sh
index 135bdd2..cf56dcf 100755
--- a/htrace-core/src/go/gobuild.sh
+++ b/htrace-core/src/go/gobuild.sh
@@ -68,13 +68,16 @@ if [ -x "/sbin/ldconfig" ]; then
# Suse requires ldconfig to be run via the absolute path
ldconfig=/sbin/ldconfig
else
- ldconfig=ldconfig
+ which ldconfig &> /dev/null
+ [ $? -eq 0 ] && ldconfig=ldconfig
fi
-if "${ldconfig}" -p | grep -q libleveldb; then
- :
-else
- echo "You must install the leveldb-devel package (or distro-specific equivalent.)"
- exit 1
+if [ -v ldconfig ]; then
+ if "${ldconfig}" -p | grep -q libleveldb; then
+ :
+ else
+ echo "You must install the leveldb-devel package (or distro-specific equivalent.)"
+ exit 1
+ fi
fi
go "${ACTION}" -v org/apache/htrace/htraced org/apache/htrace/htrace "$@"