This is an automated email from the ASF dual-hosted git repository. cmcfarlen pushed a commit to branch 10.0.x in repository https://gitbox.apache.org/repos/asf/trafficserver.git
commit 9005d1578815c307032bd822decdca7b0b438625 Author: Walt Karas <[email protected]> AuthorDate: Mon Jul 8 10:16:20 2024 -0400 Use "git rev-parse --absolute-git-dir" in tools scripts. (#11495) The alternate way of getting this, that we are currently using, doesn't work in cmake version 3.28. (cherry picked from commit 2ef63fa5140d6baf119a07b0a3610eedab43d888) --- tools/autopep8.sh | 8 ++++---- tools/clang-format.sh | 10 +++++----- tools/cmake-format.sh | 8 ++++---- tools/yapf.sh | 8 ++++---- 4 files changed, 17 insertions(+), 17 deletions(-) diff --git a/tools/autopep8.sh b/tools/autopep8.sh index 614ec93718..1657ed8123 100755 --- a/tools/autopep8.sh +++ b/tools/autopep8.sh @@ -39,8 +39,8 @@ function main() { pip install -q virtualenv fi - GIT_COMMON_DIR=$(cd $(dirname $0) && git rev-parse --path-format=absolute --git-common-dir) - AUTOPEP8_VENV=${AUTOPEP8_VENV:-${GIT_COMMON_DIR}/fmt/autopep8_${AUTOPEP8_VERSION}_venv} + GIT_DIR=$(git rev-parse --absolute-git-dir) + AUTOPEP8_VENV=${AUTOPEP8_VENV:-${GIT_DIR}/fmt/autopep8_${AUTOPEP8_VERSION}_venv} if [ ! -e ${AUTOPEP8_VENV} ] then virtualenv ${AUTOPEP8_VENV} @@ -102,6 +102,6 @@ function main() { if [[ "$(basename -- "$0")" == 'autopep8.sh' ]]; then main "$@" else - GIT_COMMON_DIR=$(git rev-parse --path-format=absolute --git-common-dir) - AUTOPEP8_VENV=${AUTOPEP8_VENV:-${GIT_COMMON_DIR}/fmt/autopep8_${AUTOPEP8_VERSION}_venv} + GIT_DIR=$(git rev-parse --absolute-git-dir) + AUTOPEP8_VENV=${AUTOPEP8_VENV:-${GIT_DIR}/fmt/autopep8_${AUTOPEP8_VERSION}_venv} fi diff --git a/tools/clang-format.sh b/tools/clang-format.sh index 3be0183a1e..bd887604cf 100755 --- a/tools/clang-format.sh +++ b/tools/clang-format.sh @@ -24,8 +24,8 @@ PKGDATE="20240430" function main() { set -e # exit on error - GIT_COMMON_DIR=$(cd $(dirname $0) && git rev-parse --path-format=absolute --git-common-dir) - ROOT=${ROOT:-${GIT_COMMON_DIR}/fmt/${PKGDATE}} + GIT_DIR=$(git rev-parse --absolute-git-dir) + ROOT=${ROOT:-${GIT_DIR}/fmt/${PKGDATE}} # The presence of this file indicates clang-format was successfully installed. INSTALLED_SENTINEL=${ROOT}/.clang-format-installed @@ -38,7 +38,7 @@ function main() { exit 2 fi fi - DIR=${@:-$(dirname ${GIT_COMMON_DIR})} + DIR=${@:-$(dirname ${GIT_DIR})} PACKAGE="clang-format-${PKGDATE}.tar.bz2" VERSION="clang-format version 18.1.2 (https://github.com/llvm/llvm-project.git 26a1d6601d727a96f4301d0d8647b5a42760ae0c)" @@ -119,6 +119,6 @@ EOF if [[ "$(basename -- "$0")" == 'clang-format.sh' ]]; then main "$@" else - GIT_COMMON_DIR=$(git rev-parse --path-format=absolute --git-common-dir) - ROOT=${ROOT:-${GIT_COMMON_DIR}/fmt/${PKGDATE}} + GIT_DIR=$(git rev-parse --absolute-git-dir) + ROOT=${ROOT:-${GIT_DIR}/fmt/${PKGDATE}} fi diff --git a/tools/cmake-format.sh b/tools/cmake-format.sh index 2b8ee00ba4..513940b3fb 100755 --- a/tools/cmake-format.sh +++ b/tools/cmake-format.sh @@ -33,8 +33,8 @@ function main() { pip install -q virtualenv fi - GIT_COMMON_DIR=$(cd $(dirname $0) && git rev-parse --path-format=absolute --git-common-dir) - CMAKE_FORMAT_VENV=${CMAKE_FORMAT_VENV:-${GIT_COMMON_DIR}/fmt/cmake_format_${CMAKE_FORMAT_VERSION}_venv} + GIT_DIR=$(git rev-parse --absolute-git-dir) + CMAKE_FORMAT_VENV=${CMAKE_FORMAT_VENV:-${GIT_DIR}/fmt/cmake_format_${CMAKE_FORMAT_VERSION}_venv} if [ ! -e ${CMAKE_FORMAT_VENV} ] then virtualenv ${CMAKE_FORMAT_VENV} @@ -86,6 +86,6 @@ function main() { if [[ "$(basename -- "$0")" == 'cmake-format.sh' ]]; then main "$@" else - GIT_COMMON_DIR=$(git rev-parse --path-format=absolute --git-common-dir) - CMAKE_FORMAT_VENV=${CMAKE_FORMAT_VENV:-${GIT_COMMON_DIR}/fmt/cmake_format_${CMAKE_FORMAT_VERSION}_venv} + GIT_DIR=$(git rev-parse --absolute-git-dir) + CMAKE_FORMAT_VENV=${CMAKE_FORMAT_VENV:-${GIT_DIR}/fmt/cmake_format_${CMAKE_FORMAT_VERSION}_venv} fi diff --git a/tools/yapf.sh b/tools/yapf.sh index a6ca3795b3..cf07f81874 100755 --- a/tools/yapf.sh +++ b/tools/yapf.sh @@ -47,8 +47,8 @@ _END_ fi REPO_ROOT=$(cd $(dirname $0) && git rev-parse --show-toplevel) - GIT_COMMON_DIR=$(cd $(dirname $0) && git rev-parse --path-format=absolute --git-common-dir) - YAPF_VENV=${YAPF_VENV:-${GIT_COMMON_DIR}/fmt/yapf_${YAPF_VERSION}_venv} + GIT_DIR=$(git rev-parse --absolute-git-dir) + YAPF_VENV=${YAPF_VENV:-${GIT_DIR}/fmt/yapf_${YAPF_VERSION}_venv} if [ ! -e ${YAPF_VENV} ] then python3 -m virtualenv ${YAPF_VENV} @@ -108,6 +108,6 @@ _END_ if [[ "$(basename -- "$0")" == 'yapf.sh' ]]; then main "$@" else - GIT_COMMON_DIR=$(git rev-parse --path-format=absolute --git-common-dir) - YAPF_VENV=${YAPF_VENV:-${GIT_COMMON_DIR}/fmt/yapf_${YAPF_VERSION}_venv} + GIT_DIR=$(git rev-parse --absolute-git-dir) + YAPF_VENV=${YAPF_VENV:-${GIT_DIR}/fmt/yapf_${YAPF_VERSION}_venv} fi
