diff --git a/git-dist-kernel.sh b/git-dist-kernel.sh index 1e82140f1897c3baee0edaeb832ab9960e5de6ac..55d3a4079e69cfaacfc6d2fb2c4963f97cadcd72 100755 --- a/git-dist-kernel.sh +++ b/git-dist-kernel.sh @@ -6,8 +6,6 @@ function download() { curl -f --progress-bar --continue-at - --location --output "${path}" "${url}" } -# - function installdeps() { # shellcheck source=/dev/null source /etc/os-release @@ -89,32 +87,32 @@ GIT_TAR_PATH="/tmp/buildgit/git-${git_version}.tar.xz" #https://github.com/git/git/archive/v2.13.2.tar.gz echo "download: ${GIT_TAR_URL}" -# check sha256sum if GIT_GITHUB_HASH is matched -if [[ -f "$GIT_TAR_PATH" ]]; then - if [[ "x$GIT_KERNAL_HASH" != "x" ]]; then - echo "check $GIT_TAR_PATH sha256sum" - if sha256sum "$GIT_TAR_PATH" | grep "$GIT_KERNAL_HASH"; then - echo "$GIT_TAR_PATH sha256sum = $GIT_KERNAL_HASH" - else - echo "sha256sum does not match" - rm "$GIT_TAR_PATH" - fi - fi -fi - if [[ ! -f $GIT_TAR_PATH ]]; then download "${GIT_TAR_URL}" "${GIT_TAR_PATH}" + + if [[ ! -f $GIT_TAR_PATH ]]; then + exit 1 + fi fi -if [[ -f "${GIT_TAR_PATH}" ]]; then - cd "/tmp/buildgit" || exit 1 - tar -xvf "${GIT_TAR_PATH}" - compilegit "/tmp/buildgit/git-$git_version" "/usr/local" +# check sha256sum if GIT_KERNAL_HASH is matched +if [[ "x$GIT_KERNAL_HASH" != "x" ]]; then + echo "check $GIT_TAR_PATH sha256sum" + if sha256sum "$GIT_TAR_PATH" | grep "$GIT_KERNAL_HASH"; then + echo "$GIT_TAR_PATH sha256sum = $GIT_KERNAL_HASH" + else + echo "sha256sum does not match" + rm "$GIT_TAR_PATH" + exit 1 + fi fi +cd "/tmp/buildgit" || exit 1 +echo "unpack ${GIT_TAR_PATH}" +tar -xf "${GIT_TAR_PATH}" +compilegit "/tmp/buildgit/git-$git_version" "/usr/local" + echo "complete install git" -if [[ -d "/tmp/buildgit" ]]; then - echo "delete git source files" - rm -rf "/tmp/buildgit" -fi +echo "delete git source files" +rm -rf "/tmp/buildgit" diff --git a/git-dist.sh b/git-dist.sh index 1f0e2a7f1154d569423102ff8d9dea178462cd15..d56e8aba1319e94816c1888fbaf5bfe64f2df6d9 100755 --- a/git-dist.sh +++ b/git-dist.sh @@ -84,32 +84,32 @@ GIT_TAR_PATH="/tmp/buildgit/git-${git_version}.tar.gz" #https://github.com/git/git/archive/v2.13.2.tar.gz echo "download: ${GIT_TAR_URL}" -# check sha256sum if GIT_GITHUB_HASH is matched -if [[ -f "$GIT_TAR_PATH" ]]; then - if [[ "x$GIT_GITHUB_HASH" != "x" ]]; then - echo "check $GIT_TAR_PATH sha256sum" - if sha256sum "$GIT_TAR_PATH" | grep "$GIT_GITHUB_HASH"; then - echo "$GIT_TAR_PATH sha256sum = $GIT_GITHUB_HASH" - else - echo "sha256sum does not match" - rm "$GIT_TAR_PATH" - fi - fi -fi - if [[ ! -f $GIT_TAR_PATH ]]; then download "${GIT_TAR_URL}" "${GIT_TAR_PATH}" + + if [[ ! -f $GIT_TAR_PATH ]]; then + exit 1 + fi fi -if [[ -f "${GIT_TAR_PATH}" ]]; then - cd "/tmp/buildgit" || exit 1 - tar -xvf "${GIT_TAR_PATH}" - compilegit "/tmp/buildgit/git-$git_version" "/usr/local" +# check sha256sum if GIT_GITHUB_HASH is matched +if [[ "x$GIT_GITHUB_HASH" != "x" ]]; then + echo "check $GIT_TAR_PATH sha256sum" + if sha256sum "$GIT_TAR_PATH" | grep "$GIT_GITHUB_HASH"; then + echo "$GIT_TAR_PATH sha256sum = $GIT_GITHUB_HASH" + else + echo "sha256sum does not match" + rm "$GIT_TAR_PATH" + exit 1 + fi fi +cd "/tmp/buildgit" || exit 1 +echo "unpack ${GIT_TAR_PATH}" +tar -xf "${GIT_TAR_PATH}" +compilegit "/tmp/buildgit/git-$git_version" "/usr/local" + echo "complete install git" -if [[ -d "/tmp/buildgit" ]]; then - echo "delete git source files" - rm -rf "/tmp/buildgit" -fi +echo "delete git source files" +rm -rf "/tmp/buildgit" diff --git a/ps/version.ps1 b/ps/version.ps1 index 03eb43d62eddcb495ad16626c440cef3b4cd45a6..5b9a9aa97a95292d2f509dd28433a2a346c803e0 100644 --- a/ps/version.ps1 +++ b/ps/version.ps1 @@ -18,8 +18,8 @@ $CURL_HASH = "4d51346fe621624c3e4b9f86a8fd6f122a143820e17889f59c18f245d2d8e7a6" $EXPAT_VERSION = "2.2.7" $EXPAT_HASH = "30e3f40acf9a8fdbd5c379bdcc8d1178a1d9af306de29fc8ece922bc4c57bef8" -$GIT_VERSION = "2.35.8" -$GIT_HASH = "026886aebea2ddc31fd68e91b21ffa06e99b353cb2a18f91327a52e0f2ec65f3" +$GIT_VERSION = "2.43.0" +$GIT_HASH = "5446603e73d911781d259e565750dcd277a42836c8e392cac91cf137aa9b76ec" # Filename $ZLIB_FILENAME = "zlib-${ZLIB_VERSION}" diff --git a/version b/version index 70a6f8e8b5251f23c9050ea6dbe92710d9862b5c..179385c8ee54444633551aff470471a8387b6565 100644 --- a/version +++ b/version @@ -1,5 +1,5 @@ -GIT_REAL_VERSION="2.35.8" -GIT_KERNAL_HASH="026886aebea2ddc31fd68e91b21ffa06e99b353cb2a18f91327a52e0f2ec65f3" -GIT_GITHUB_HASH="e419c8f6c4d0f7843fc9657e1844974caabb5333feb2abbf0434c98a9ce52f3c" +GIT_REAL_VERSION="2.43.0" +GIT_KERNAL_HASH="5446603e73d911781d259e565750dcd277a42836c8e392cac91cf137aa9b76ec" +GIT_GITHUB_HASH="4e1599231f77d64f01d46a773e7741218fb8d98f2a05ccd2b8f35fc7ecf62040" CMAKE_VERSION="3.20" CMAKE_PATCH="0"