From c7a1844112b7fb83ff979607bef8b24212e4aa25 Mon Sep 17 00:00:00 2001
From: "Alejandro R. Mosteo" <amosteo@unizar.es>
Date: Wed, 12 Jun 2024 17:54:17 +0200
Subject: [PATCH] Windows dispatcher script

---
 scripts/ci-github.sh        |   6 ++++++
 scripts/version-patcher.ps  | Bin 0 -> 751 bytes
 scripts/version-patcher.sh  |   5 ++++-
 src/alire/alire-version.ads |   2 +-
 4 files changed, 11 insertions(+), 2 deletions(-)
 create mode 100644 scripts/version-patcher.ps

diff --git a/scripts/ci-github.sh b/scripts/ci-github.sh
index 50a8f4d6e..d2a3af6a4 100755
--- a/scripts/ci-github.sh
+++ b/scripts/ci-github.sh
@@ -13,6 +13,12 @@ pushd "$( cd -- "$( dirname -- "${BASH_SOURCE[0]}" )" &> /dev/null && pwd )"
     . ../dev/functions.sh
 popd
 
+# Mark location safe to assuage git if necessary (happens in some distros)
+if "$(git status 2>&1||true)" | grep -q "dubious ownership"; then
+    echo "Marking $PWD as safe for git"
+    git config --add safe.directory "$PWD"
+fi
+
 # Patch version
 scripts/version-patcher.sh
 
diff --git a/scripts/version-patcher.ps b/scripts/version-patcher.ps
new file mode 100644
index 0000000000000000000000000000000000000000..1929c9fde3e6b86de7ee3890d73a9c96f3ab2eac
GIT binary patch
literal 751
zcmb`FPfz185XJBQ6i+Q$u~HNEyb{uOD}=a|iXd@BZZc^`xVAN(@JER6zD`IHAh@kB
zw#W9HH$TrD*BvLMS~w~iPSI-JQGy0&M_4u%uOV5$wn~C+&#qy=18Zr_92F^&3fGE#
zXb5c(Y{COc)sb_95IwRYc#udCb96RL%UU`3jZjNMz9yVvR%wVcV~)1$hi&R(45BCZ
zBq`s$oqU|+<Ik~@9x1<^<DwmH=POp8kSnuJ$ToTD5uL4RfhNEQ?Q#W%TO40g(qdz^
z!;tqUo(=N25mqWLdyTzfmX9+Oc@rBDXgM=4AeU%RIVUYvVZXP&!7j?k2*tZfQL!Vh
z?r9agvhV5ZOn(n>r(*HI+1Wv{EOXMq-XVZugYPhX!dB)t-x$t}{-4(@_GWVwUg5Zk
zjz2&i`AlxUB!08JT3@Wse`6iS9@G#V?7d}Yw~mIUdPO{8S|HtVjQLL|Kx51OGB3vb
M82=T2tn8Bc2PLrn%m4rY

literal 0
HcmV?d00001

diff --git a/scripts/version-patcher.sh b/scripts/version-patcher.sh
index 2c7d39c2a..104e613c2 100755
--- a/scripts/version-patcher.sh
+++ b/scripts/version-patcher.sh
@@ -19,4 +19,7 @@ else
     exit 0
 fi
 
-$bin "$@"
\ No newline at end of file
+$bin "$@"
+
+echo "Resulting version file:"
+cat src/alire/alire-version.ads
\ No newline at end of file
diff --git a/src/alire/alire-version.ads b/src/alire/alire-version.ads
index c51fde2ab..6dbd1a1d6 100644
--- a/src/alire/alire-version.ads
+++ b/src/alire/alire-version.ads
@@ -16,7 +16,7 @@ private
    --  be replaced by `alr build` with the current commit, and appended with
    --  "_or_later" after build.
 
-   Current_Str : constant String := "2.1-dev+3ab04c93_dirty";
+   Current_Str : constant String := "2.1-dev+204eb4e4_dirty";
    --  2.0.0:     alr settings refactor and minor fixes
    --  2.0.0-rc1: release candidate for 2.0
    --  2.0.0-b1:  first public release on the 2.0 branch