diff --git a/eigen.sh b/eigen.sh index cb8edda..8e27764 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*" @@ -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 diff --git a/protobuf.sh b/protobuf.sh index d0a1878..43f1e06 100755 --- a/protobuf.sh +++ b/protobuf.sh @@ -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*"