You are viewing a plain text version of this content. The canonical link for it is here.
Posted to issues@trafficcontrol.apache.org by GitBox <gi...@apache.org> on 2018/11/03 22:41:19 UTC

[GitHub] dg4prez closed pull request #2986: 3.0.x: fix grove and grovetccfg build from tarball

dg4prez closed pull request #2986: 3.0.x: fix grove and grovetccfg build from tarball
URL: https://github.com/apache/trafficcontrol/pull/2986
 
 
   

This is a PR merged from a forked repository.
As GitHub hides the original diff on merge, it is displayed below for
the sake of provenance:

As this is a foreign pull request (from a fork), the diff is supplied
below (as it won't show otherwise due to GitHub magic):

diff --git a/grove/build/build_rpm.sh b/grove/build/build_rpm.sh
index e7a430c9e..83c4d3932 100755
--- a/grove/build/build_rpm.sh
+++ b/grove/build/build_rpm.sh
@@ -14,7 +14,6 @@
 
 #----------------------------------------
 function importFunctions() {
-	TC_DIR=$(git rev-parse --show-toplevel)
 	[ ! -z "$TC_DIR" ] || { echo "Cannot find repository root." >&2 ; exit 1; }
 	export TC_DIR
 	functions_sh="$TC_DIR/build/functions.sh"
diff --git a/grove/grovetccfg/build/build_rpm.sh b/grove/grovetccfg/build/build_rpm.sh
index 223e72d12..799ee36b3 100755
--- a/grove/grovetccfg/build/build_rpm.sh
+++ b/grove/grovetccfg/build/build_rpm.sh
@@ -14,7 +14,6 @@
 
 #----------------------------------------
 function importFunctions() {
-	TC_DIR=$(git rev-parse --show-toplevel)
 	[ ! -z "$TC_DIR" ] || { echo "Cannot find repository root." >&2 ; exit 1; }
 	export TC_DIR
 	functions_sh="$TC_DIR/build/functions.sh"


 

----------------------------------------------------------------
This is an automated message from the Apache Git Service.
To respond to the message, please log on GitHub and use the
URL above to go to the specific comment.
 
For queries about this service, please contact Infrastructure at:
users@infra.apache.org


With regards,
Apache Git Services