Merge pull request git-for-windows#558 from Morilli/fix-reg-query

getgit: Fix user path reg query result potentially getting truncated
dscho · Jun 12, 2024 · 636e970 · 636e970
2 parents 87b4bd9 + dba6db7
commit 636e970
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/git-extra/PKGBUILD b/git-extra/PKGBUILD
@@ -5,7 +5,7 @@ pkgbase="mingw-w64-${_realname}"
 pkgname=($_realname
         "${MINGW_PACKAGE_PREFIX}-${_realname}")
 _ver_base=1.1
-pkgver=1.1.636.2db97b993
+pkgver=1.1.641.031e03baf
 pkgrel=1
 pkgdesc="Git for Windows extra files"
 arch=('any')

diff --git a/git-extra/getgit b/git-extra/getgit
@@ -248,7 +248,7 @@ echo "be removed from the context menu is available as $rm_ctxmenu "
 echo ""
 # Setting ENV
 echo -n "Setting env ..."
-userpath=$(reg query "HKEY_CURRENT_USER\Environment" //v Path 2>/dev/null | awk 'NR==3 {print $NF}')
+userpath="$(powershell -command '(Get-ItemProperty -Path 'HKCU:\Environment' -Name Path).Path')"
 if [[ "$userpath" == "" ]]; then
     setx PATH "$(cygpath -m /cmd)" > /dev/null 2>&1
 elif [[ "$userpath" != *"$(cygpath -m /cmd)"* ]]; then