taler-windows

commit 3e61841910125b25dea6b30850e5314536e6f724
parent 0594995c4c59174c32a9c4af72a4b237d6b14958
Author: Lea <lea.oualli@outlook.fr>
Date:   Thu, 24 Apr 2025 09:38:13 +0200

Update

Diffstat:
M
Merchant client/install-talerV1.bat
 | 
14
++++++++++++++
A
NSIS/GNU-Taler-Installer2V1.exe
 | 
0

M
source/install-talerV1.sh
 | 
12
++++++++++++

3 files changed, 26 insertions(+), 0 deletions(-)
diff --git a/Merchant client/install-talerV1.bat b/Merchant client/install-talerV1.bat
@@ -1,10 +1,14 @@
 @echo off
 <<<<<<< HEAD
+<<<<<<< HEAD
+=======
+>>>>>>> 27ac2d3 (Update)
 setlocal
 
 echo === Lancement de l'installation de GNU Taler via WSL ===
 
 
+<<<<<<< HEAD
 wsl -d Debian -- bash /mnt/c/Users/%USERNAME%/taler-windows/source/install-taler.sh
 
 echo.
@@ -14,3 +18,13 @@ echo === GNU Taler Installer - Lancement manuel ===
 wsl -d Debian bash "/mnt/c/Program Files (x86)/Taler_Merchant/source/install-talerV1.sh"
 >>>>>>> d43d770 (Ajout du script NSIS + installeur automatique)
 pause
+=======
+wsl -d Debian -- bash /mnt/c/Users/%USERNAME%/Desktop/taler-windows/source/install-talerV1.sh
+
+echo.
+echo ✅ Script terminé. Vérifie les messages dans la console.
+pause
+
+
+
+>>>>>>> 27ac2d3 (Update)
diff --git a/NSIS/GNU-Taler-Installer2V1.exe b/NSIS/GNU-Taler-Installer2V1.exe
Binary files differ.
diff --git a/source/install-talerV1.sh b/source/install-talerV1.sh
@@ -1,5 +1,8 @@
 #!/bin/bash
 <<<<<<< HEAD
+<<<<<<< HEAD
+=======
+>>>>>>> 27ac2d3 (Update)
 
 set -e
 
@@ -22,6 +25,7 @@ sudo apt install -y taler-merchant
 
 echo "✅ Installation terminée."
 
+<<<<<<< HEAD
 =======
 set -e
 
@@ -33,3 +37,11 @@ echo "Installation en cours..."
 sleep 1
 echo "☑️ Tout s'est bien passé."
 >>>>>>> d43d770 (Ajout du script NSIS + installeur automatique)
+=======
+sudo apt update
+sudo apt install -y postgresql
+
+bash /mnt/c/Users/$USER/Desktop/taler-windows/source/setup_postgresql.sh
+
+echo "Postgres est installé"
+>>>>>>> 27ac2d3 (Update)