From cc963059d44d6a2e701078fd5871a3186a8b5eca Mon Sep 17 00:00:00 2001 From: Lucas Date: Fri, 10 Oct 2025 16:33:33 +0200 Subject: [PATCH] petits ajouts --- .launcher.sh.un~ | Bin 15558 -> 73584 bytes launcher.sh | 29 ++++++++++++++++++++++------- 2 files changed, 22 insertions(+), 7 deletions(-) diff --git a/.launcher.sh.un~ b/.launcher.sh.un~ index 1820e8b4b952363da0f0367fff1b5955dd192466..a54197ba895366f544f13581adc3edd4c9463b48 100755 GIT binary patch literal 73584 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 delta 109 zcmeyckL6gUepqJi{Lnm?{HF{|ep@y=i>$FvRFE$>n>0tFYsXQgpxN2m_Ugo%S580b z7{b87$ThjpLs(vs0RliY3^QcB*nf?M5h%jAv9#KXkzw;kt7b+<#>u5N$xP2z0RR9+ BAz=Uj diff --git a/launcher.sh b/launcher.sh index f58e28f..8972843 100755 --- a/launcher.sh +++ b/launcher.sh @@ -28,14 +28,14 @@ env="prod" #AFS if [ "$env" = "dev" ]; then afs="$HOME/test" - printf "ATTENTION: Vous etes en mode 'dev'. Les path ont changés" + printf "ATTENTION: Vous etes en mode 'dev'. Les path ont changés !\n" else afs="$HOME/afs" #i3="$afs/.confs/config/i3/config" fi -i3=$afs/.confs/config/i3/ +i3=$afs/.confs/config/i3 i3_config=$i3/config mkdir -p $afs $i3 @@ -61,8 +61,8 @@ launcher_url="https://github.com/PrismLauncher/PrismLauncher/releases/download/9 config_url="https://raw.githubusercontent.com/PixPix20/Minecraft-Installer/refs/heads/main/prismlauncher.cfg" #URL pour télécharger la config du launcher show_version(){ - printf "Version ${$version}" - print "Environement ${env}" + printf "Version ${VERSION}\n" + printf "Environement : ${env}\n" } help_msg(){ @@ -82,12 +82,18 @@ EOF } check_commands(){ + local err #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" + if ! command -v "$cmd" &> /dev/null; then + printf "${cmd} n'est pas installée ! \n" + err=true fi done + if err=true; then + return 1 + else return 0 + fi } check_storage(){ @@ -126,7 +132,7 @@ add_to_dmenu() { # Ajoute le bin dans le PATH via dmenu_run 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" + 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" @@ -226,6 +232,13 @@ main() { case "$1" in -i|--install) + if [ check_commands ]; then + if [ "$env"!="dev" ]; then + printf "erreur" + exit 1 + fi + fi + check_storage || exit 1 check_path check_config @@ -234,12 +247,14 @@ main() { echo "Installation terminée." ;; -u|--update) + check_commands check_script_update ;; -r|--remove) remove_all ;; -l|--launch) + check_commands check_path check_config check_launcher