From 51031cc1fe7dedb145773f01bb068c97a8fcf3ca Mon Sep 17 00:00:00 2001 From: Adam Honse Date: Fri, 17 Jan 2025 01:13:17 -0600 Subject: [PATCH] Try to fix git-get-branch.sh call on Windows --- OpenRGB.pro | 8 +++++++- scripts/git-get-branch.ps1 | 2 ++ 2 files changed, 9 insertions(+), 1 deletion(-) create mode 100644 scripts/git-get-branch.ps1 diff --git a/OpenRGB.pro b/OpenRGB.pro index 1554e6ae..cab34615 100644 --- a/OpenRGB.pro +++ b/OpenRGB.pro @@ -73,7 +73,13 @@ freebsd:BUILDDATE = $$system(date -j -R -r "${SOURCE_DATE_EPOCH:-$(date +% macx:BUILDDATE = $$system(date -j -R -r "${SOURCE_DATE_EPOCH:-$(date +%s)}") GIT_COMMIT_ID = $$system(git log -n 1 --pretty=format:"%H") GIT_COMMIT_DATE = $$system(git log -n 1 --pretty=format:"%ci") -GIT_BRANCH = $$system(scripts/git-get-branch.sh) + +unix { + GIT_BRANCH = $$system(sh scripts/git-get-branch.sh) +} +else { + GIT_BRANCH = $$system(pwsh scripts/git-get-branch.ps1) +} message("GIT_BRANCH: "$$GIT_BRANCH) DEFINES += \ diff --git a/scripts/git-get-branch.ps1 b/scripts/git-get-branch.ps1 new file mode 100644 index 00000000..d7a6e723 --- /dev/null +++ b/scripts/git-get-branch.ps1 @@ -0,0 +1,2 @@ +$HASH = git log --pretty=%h -1 +git show-ref | select-string $HASH | select-string -NotMatch HEAD | foreach {$_ -replace '.*/(.*)','$1'}