From f8742efed4d86425af8635d38a23ec4171637e4f Mon Sep 17 00:00:00 2001
From: Lucas <lucas.morel@epita.fr>
Date: Fri, 10 Oct 2025 09:20:16 +0200
Subject: [PATCH] ajout de la verfication de la presences des commandes

---
 .launcher.sh.un~ | Bin 8117 -> 53986 bytes
 launcher.sh      |  41 ++++++++++++++++++++++++++---------------
 2 files changed, 26 insertions(+), 15 deletions(-)

diff --git a/.launcher.sh.un~ b/.launcher.sh.un~
index 57c2cf52c39ef69a5da678c55715ff2115aa9e41..b23153f6189d81717ccbc604394922d78ee7e62d 100755
GIT binary patch
literal 53986
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

delta 117
zcmaE~lzFRtVpwMG{Lnm?{HF{|RpBRWXB}nXsI&O_?&@Ri{kz$}#2Rnp4i>rTv?%In
waRmbd!!IC)0Tv*G5r_q$0w5ZO88V*7$+3WBnKmYN$}%!+el2@~k?Hv=0MWT0od5s;

diff --git a/launcher.sh b/launcher.sh
index a51be07..01772ca 100755
--- a/launcher.sh
+++ b/launcher.sh
@@ -6,7 +6,7 @@
 # Auteur  : Lucas Morel <lucas.morel@epita.fr>
 # Version : v1.1  (https://github.com/PixPix20/Minecraft-Installer)
 #
-# 1) Objet : Ce script vise à automatiser le lancement de PrismLauncher.
+# 1) Objet : Ce script vise à automatiser le lancement et l'installation de PrismLauncher.
 #
 # 2) Garantie : Fourni "tel quel", sans garantie expresse ou implicite.
 #
@@ -24,15 +24,11 @@ set -euo pipefail
 
 VERSION="1.1"
 
-#On verifie qu'il y a assez de place pour installer minecraft en plus de garder un peu de place pour le reste
-#STOCKAGE
-max_storage=2147483648 #2Go, le stockage max de l'afs, je deconseille fortement d'augmenter cette valeur !
-minecraft_storage=943718400 #900Mo, j'utilise cette valeur si vous voulez jouer avec un modpack qui est lourd
-margin_storage=419430400 #400Mo, marge de securité pour que vous puissiez utiliser l'afs aprés l'installation du jeu, je deconseille de modifier cette valeur
 env="prod"
 #AFS
 if [ "$env" = "dev" ]; then
 	afs="$HOME/test"
+    printf "ATTENTION: Vous etes en mode 'dev'."
 else
 	afs="$HOME/afs"
 	i3="$afs/.confs/config/i3/config"
@@ -43,6 +39,12 @@ i3_config=$i3/config
 mkdir -p $afs $i3
 
 
+max_storage=2147483648 #2Go, le stockage max de l'afs, je deconseille fortement d'augmenter cette valeur !
+
+max_storage=2147483648 
+minecraft_storage=943718400
+margin_storage=419430400
+
 #LAUNCHER
 
 minecraft_path="$afs/minecraft" #dossier qui contient minecraft la conf du launcher etc
@@ -77,13 +79,26 @@ Options:
 EOF
 }
 
+check_commands(){
+    #Check si les commandes utilisées sont installées
+    for cmd in wget curl sed grep nix-shell; do 
+        if ! command --version "$cmd" &> /dev/null; then
+            printf "${cmd} n'est pas installée"
+        fi
+    done 
+}
 
 check_storage(){
 	#verification si l'AFS peut installer minecraft en plus de garder un marge pour les autre fichiers
 	local used_storage total_storage
 	used_storage=$(du -sb "$afs"|awk '{print $1}')
-        total_storage=$((used_storage + minecraft_storage + margin_storage)) #On additionne le stockage déja utilisé, la taille (~) de MC puis on ajoute une marge de secu.
-	
+    total_storage=$((used_storage + minecraft_storage + margin_storage)) #On additionne le stockage déja utilisé, la taille (~) de MC puis on ajoute une marge de secu.
+    if ((max_storage < $total_storage)); then 
+        printf "Erreur, pas assez de place pour l'installation ! ${total_storage}Mo requis."
+        return 1
+    else 
+        return 0
+    fi
 }
 
 check_path(){
@@ -110,19 +125,15 @@ add_to_dmenu() {
     sed -i "s|bindsym \$mod+d exec --no-startup-id dmenu_run|bindsym \$mod+d exec --no-startup-id PATH=$bin_path:\$PATH dmenu_run|" "$i3_config"
     echo "export PATH=$bin_path:\$PATH" >> "$HOME/.bashrc"
     echo "bindsym $mod+m exec --no-startup-id minecraft-launcher -l" >> "$i3_config"
-    
     source "$HOME/.bashrc"
     cp "$0" "$bin_path/minecraft-launcher"
-    
-    chmod +x "$bin_path/minecraft-launcher"
-    #echo "Ajouté à dmenu !"
+    chmod +x "$bin_path/minecraft-launcher" 
 }
 
 remove_all() {
-    #echo "Suppression de Minecraft et du launcher..."
+    #Supprime PrismLauncher et les dossiers de minecraft
     rm -rf "$minecraft_path"
     sed -i "s|PATH=$bin_path:\$PATH||g" "$HOME/.bashrc"
-    #echo "Suppression terminée."
 }
 
 update_script() {
@@ -147,6 +158,7 @@ get_remote_version() {
 }
 
 check_script_update() {
+    #Met à jour le script vers la nouvelle version
     local_version="$VERSION"
     remote_version=$(get_remote_version)
 
@@ -184,7 +196,6 @@ check_account(){
 check_launcher(){
 	#telechargement du launcher si inexistant
 	if [ ! -f "$launcher_appimage" ]; then
-    	   #echo "Téléchargement de $name..."
     	   mkdir -p "$(dirname "$launcher_appimage")"
     	   #curl -L -o "$launcher_appimage" "$launcher_url" #si wget ne marche pas, décommentez cette ligne et commentez l'autre
     	   wget -q -O "$launcher_appimage" "$launcher_url"