From a7273f2d630d340949f52de2163b5f4aeb3e15b9 Mon Sep 17 00:00:00 2001
From: Gardouille <gardouille@gmail.com>
Date: Mon, 9 Oct 2023 14:39:07 +0200
Subject: [PATCH] Need to patch devtools script to use Justfile
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Otherwise `git detach` use the wrong Justfile…
---
 build-deb.package.sh                    | 12 +++++++++++-
 patch/devtools.deb-package.sh.458.patch | 12 ++++++++++++
 2 files changed, 23 insertions(+), 1 deletion(-)
 create mode 100644 patch/devtools.deb-package.sh.458.patch

diff --git a/build-deb.package.sh b/build-deb.package.sh
index c04e727..c139070 100755
--- a/build-deb.package.sh
+++ b/build-deb.package.sh
@@ -35,8 +35,18 @@ patch_justfile() {
 
 	if [ "${gh_justfile_issue_opened}" = "1" ]; then
 		echo "Patch Justfile to fix issue https://github.com/eza-community/eza/issues/458"
+		## Justfile
 		wget --quiet "https://git.101010.fr/gardouille/eza-docker-build/raw/branch/main/patch/Justfile.458.patch" --output-document=/tmp/Justfile.458.patch --
-		patch Justfile < /tmp/Justfile.458.patch
+		patch Justfile < /tmp/Justfile.458.patch --output=/tmp/Justfile.patched
+
+		## devtools script to be able to use Justfile after `git detach`
+		wget --quiet "https://git.101010.fr/gardouille/eza-docker-build/raw/branch/main/patch/devtools.deb-package.sh.458.patch" --output-document=/tmp/devtools.deb-package.sh.458.patch --
+		patch devtools/deb-package.sh < /tmp/devtools.deb-package.sh.458.patch
+
+		## Commit changes to avoid warning from `git detach`
+		git config --global user.email "ci@ci.ci"
+		git config --global user.name "CI me"
+		git commit -a -m "Fix #458 Patch Justfile and devtools script"
 	elif [ "${gh_justfile_issue_opened}" != "1" ]; then
 		echo "Justfile 458 patch section can be removed."
 	else
diff --git a/patch/devtools.deb-package.sh.458.patch b/patch/devtools.deb-package.sh.458.patch
new file mode 100644
index 0000000..911a027
--- /dev/null
+++ b/patch/devtools.deb-package.sh.458.patch
@@ -0,0 +1,12 @@
+--- deb-package.sh	2023-10-09 11:57:23.372074759 +0200
++++ /tmp/deb-package.sh	2023-10-09 14:36:38.430804870 +0200
+@@ -11,6 +11,9 @@
+ echo "checkout tag ${TAG}"
+ git checkout --quiet "${TAG}"
+ 
++echo "Use patched Justfile"
++cp /tmp/Justfile.patched Justfile
++
+ echo "build man pages"
+ just man
+