From 819cb04fb7c6bdfe93e64211687a45ef0a062924 Mon Sep 17 00:00:00 2001
From: Thomas Briffard <thomas.briffard_ext@michelin.com>
Date: Wed, 21 Jul 2021 10:22:16 +0200
Subject: [PATCH] corrections pour git
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

On doit copier les différentes scripts bash de git-core et spécifier GIT_EXEC_PATH
---
 docker-compose.yml   |  1 +
 git/git_post_step.sh |  4 ++++
 git/git_pre_step.sh  | 11 ++++++++++-
 3 files changed, 15 insertions(+), 1 deletion(-)
 create mode 100755 git/git_post_step.sh

diff --git a/docker-compose.yml b/docker-compose.yml
index d5e4e22..9c34b04 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -50,6 +50,7 @@ services:
          - ./.env
        environment:
          - CUSTOM_STEP_PRE_DEPLOY=/build/git_pre_step.sh
+         - CUSTOM_STEP_POST_DEPLOY=/build/git_post_step.sh
          - NOM_APPIMAGE=git_2.32.0
        command : ["bash", "-c","/template.sh /usr/local/bin/git /build"]
 
diff --git a/git/git_post_step.sh b/git/git_post_step.sh
new file mode 100755
index 0000000..092d99c
--- /dev/null
+++ b/git/git_post_step.sh
@@ -0,0 +1,4 @@
+#!/bin/bash 
+cp -r --preserve=links /usr/local/libexec/git-core  $WORK_DIR/AppDir/usr/bin/
+
+
diff --git a/git/git_pre_step.sh b/git/git_pre_step.sh
index 72ced20..a1d70f0 100755
--- a/git/git_pre_step.sh
+++ b/git/git_pre_step.sh
@@ -2,6 +2,15 @@
 fichierIcon=/build/git.png
 fichierDesktop=/build/git.desktop
 
-AUTRES_OPTIONS="-i $fichierIcon -d $fichierDesktop"
+cat << EOF > $WORK_DIR/AppRun
+#!/bin/bash
+APPDIR=\$(dirname -- "\$0")
+
+export GIT_EXEC_PATH=\$APPDIR/usr/bin/git-core
+
+exec \$APPDIR/usr/bin/$APP_NOM "\$@"
+EOF
+
+AUTRES_OPTIONS="-i $fichierIcon -d $fichierDesktop --custom-apprun $WORK_DIR/AppRun"