From 7f873a5818f707fa3b59d8a4e1212ddbd4543c06 Mon Sep 17 00:00:00 2001 From: Zach Date: Thu, 7 Jun 2018 14:32:50 -0400 Subject: [PATCH 1/4] Corrected Regex Corrected Regex --- eigen.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/eigen.sh b/eigen.sh index cb8edda..4657f7d 100755 --- a/eigen.sh +++ b/eigen.sh @@ -49,7 +49,7 @@ find_eigen () { ANY="[^\)]*" ANY_NO_QUOTES="[^\)\\\"]*" ANY_HEX="[a-fA-F0-9]*" - ARCHIVE_HEADER="native.new_http_archive\(\s*" + ARCHIVE_HEADER="tf_http_archive\(\s*" NAME_START="name\s*=\s*\\\"" QUOTE_START="\s*=\s*\\\"" QUOTE_END="\\\"\s*,\s*" From 39d369a5c4197ae113bacb33fe029dcaa083d413 Mon Sep 17 00:00:00 2001 From: Zach Date: Thu, 7 Jun 2018 14:33:30 -0400 Subject: [PATCH 2/4] Corrected Regex for Protobuf --- protobuf.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/protobuf.sh b/protobuf.sh index d0a1878..a6e5a89 100755 --- a/protobuf.sh +++ b/protobuf.sh @@ -25,7 +25,7 @@ print_usage () { | and writes them to . If 'generate installed' is executed, | corresponds to the directory Protobuf was installed to; | defaults to /usr/local. -| +|HTTP_HEADER="tf_http_archive\(\s" | --> ${0} install [ ] | | Downloads Protobuf to (defaults to the current directory), @@ -53,7 +53,7 @@ find_protobuf () { # defs here ANY="[^\)]*" ANY_NO_QUOTES="[^\)\\\"]*" - HTTP_HEADER="native.http_archive\(\s" + HTTP_HEADER="tf_http_archive\(\s" NAME_START="name\s*=\s*\\\"" QUOTE_START="\s*=\s*\\\"" QUOTE_END="\\\"\s*,\s*" From 22e045317940647399e2fa565ad566d544bb185f Mon Sep 17 00:00:00 2001 From: Zach Date: Thu, 7 Jun 2018 14:34:57 -0400 Subject: [PATCH 3/4] Update protobuf.sh --- protobuf.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/protobuf.sh b/protobuf.sh index a6e5a89..43f1e06 100755 --- a/protobuf.sh +++ b/protobuf.sh @@ -25,7 +25,7 @@ print_usage () { | and writes them to . If 'generate installed' is executed, | corresponds to the directory Protobuf was installed to; | defaults to /usr/local. -|HTTP_HEADER="tf_http_archive\(\s" +| | --> ${0} install [ ] | | Downloads Protobuf to (defaults to the current directory), From d4f5bd7db71ef82654ba6cf0dcbedc1d1d11a650 Mon Sep 17 00:00:00 2001 From: Zach Date: Tue, 17 Jul 2018 11:40:31 -0400 Subject: [PATCH 4/4] Removed fail catch for the final two cp commands Removed fail catch for the final two cp commands. On my setup sometimes the script is ran multiple times as part of a build process. I would get errors copying if the src/dest were the same file even though all other operations were successful. Since I'm using this repo in my projects I decided to remove the fail catch on the copy to keep the exit status as 0. Plus if the files are the same the cp failing really isn't an error. --- eigen.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/eigen.sh b/eigen.sh index 4657f7d..8e27764 100755 --- a/eigen.sh +++ b/eigen.sh @@ -248,10 +248,10 @@ elif [ "${MODE}" == "generate" ]; then echo "Eigen_VERSION.cmake written to ${CMAKE_DIR}" # perform specific operations regarding installation if [ "${GENERATE_MODE}" == "external" ]; then - cp ${SCRIPT_DIR}/Eigen.cmake ${CMAKE_DIR} || fail + cp ${SCRIPT_DIR}/Eigen.cmake ${CMAKE_DIR} echo "Wrote Eigen_VERSION.cmake and Eigen.cmake to ${CMAKE_DIR}" elif [ "${GENERATE_MODE}" == "installed" ]; then - cp ${SCRIPT_DIR}/FindEigen.cmake ${CMAKE_DIR} || fail + cp ${SCRIPT_DIR}/FindEigen.cmake ${CMAKE_DIR} echo "FindEigen.cmake copied to ${CMAKE_DIR}" fi fi