* reorganization

* update java from 17 to 18
* update fish variable
* update curl for rustup
* fix string in arch script

arch.sh

@@ -124,28 +124,25 @@ then
     micro -plugin install detectindent
 
     # === GL4D ==
-    # Download and build
+    # Download, build and installation
     git clone https://github.com/noalien/GL4Dummies.git
     cd GL4Dummies || exit
     make -f Makefile.autotools
     ./configure
     make
-    # Install it
     make install
-    # Remove folder
     cd ..
     rm -rf GL4Dummies
     # Fix for shared libraries (https://stackoverflow.com/a/9395355)
     ldconfig
     # Add to path
-    #echo -e "\n# GL4Dummies\nexport PATH=/usr/local/bin:\$PATH\nexport LD_LIBRARY_PATH=/usr/local/lib:\$LD_LIBRARY_PATH\n" >> "$HOME"/.bashrc
+    fish -c "set -Ua LD_LIBRARY_PATH /usr/local/lib"
-    fish -c "set -Ux LD_LIBRARY_PATH /usr/local/lib \$LD_LIBRARY_PATH"
 
     # === Sign commits ==
     git config --global commit.gpgsign true
 
     # === Rust ==
-    curl https://sh.rustup.rs -sSf | sh -s -- -y
+    curl --proto '=https' --tlsv1.2 -sSf https://sh.rustup.rs | sh -s -- -y
     source "$HOME"/.cargo/env
     # Dev tools
     rustup component add rust-analysis
@@ -303,7 +300,7 @@ then
         fi
         fish -c 'fisher install reitzig/sdkman-for-fish'
     fi
-    sdk install java 17.0.3-tem # https://whichjdk.com/#adoptium-eclipse-temurin
+    sdk install java 18.0.2-tem # https://whichjdk.com/#adoptium-eclipse-temurin
     yes | sdk upgrade java
 
     # === UBW (pare-feu) ==
@@ -342,5 +339,5 @@ then
 
     echo -e "\nInstallation terminée.\nIl faut redémarrer l'ordinateur.\nPensez à activer les extensions après redémarrage."
 else
-    echo "Ce script ne fonctionne que sur Manjaro."
+    echo "Ce script ne fonctionne que sur Arch."
 fi

wsl.sh

@@ -25,10 +25,6 @@ then
     apt autoremove -y
 
     # === Fish ==
-    # Install micro
-    cd /usr/local/bin || exit
-    curl https://getmic.ro | GETMICRO_PLATFORM=linux64 bash
-    cd - || exit
     # Remove motd
     fish -c "set -U fish_greeting"
     # Reversed search
@@ -73,8 +69,6 @@ then
     fish -c "set -U fish_pager_color_selected_background --background=brblack"
     fish -c "set -U fish_color_option d3d0c8"
     fish -c "set -U fish_color_keyword 99cc99"
-    # EXA colors
-    fish -c "set -Ux EXA_COLORS 'di=1;36:da=35'"
     # Adding aliases
     fish -c "abbr ls 'exa --git --icons -glh'"
     fish -c "abbr cp 'cp -rv'"
@@ -97,28 +91,28 @@ then
     fish -c "abbr gc 'git clone'"
     fish -c "abbr tlmgr 'sudo \$(which tlmgr)'"
 
-    # === Micro configuration ==
+    # === Micro ==
+    cd /usr/local/bin || exit
+    curl https://getmic.ro | GETMICRO_PLATFORM=linux64 bash
+    cd - || exit
     git config --global core.editor "micro"
     wget -q --show-progress https://git.kennel.ml/Anri/confOS/raw/branch/main/.config/micro/settings.json -O "$HOME"/.config/micro/settings.json
     micro -plugin install detectindent
 
     # === GL4D ==
-    # Download and build
+    # Download, build and installation
     git clone https://github.com/noalien/GL4Dummies.git
     cd GL4Dummies || exit
     make -f Makefile.autotools
     ./configure
     make
-    # Installing it
     make install
-    # Removing folder
     cd ..
     rm -rf GL4Dummies
     # Fix for shared libraries (https://stackoverflow.com/a/9395355)
     ldconfig
     # Add to path
-    #echo -e "\n# GL4Dummies\nexport PATH=/usr/local/bin:\$PATH\nexport LD_LIBRARY_PATH=/usr/local/lib:\$LD_LIBRARY_PATH\n" >> "$HOME"/.bashrc
+    fish -c "set -Ua LD_LIBRARY_PATH /usr/local/lib"
-    fish -c "set -Ux LD_LIBRARY_PATH /usr/local/lib \$LD_LIBRARY_PATH"
 
     # === Latex ==
     wget http://mirror.ctan.org/systems/texlive/tlnet/install-tl-unx.tar.gz
@@ -145,6 +139,8 @@ then
 
     # === Exa ==
     cargo install exa
+    # EXA colors
+    fish -c "set -Ux EXA_COLORS 'di=1;36:da=35'"
 
     # === tldr ==
     cargo install tealdeer
@@ -165,7 +161,7 @@ then
         fi
         fish -c 'fisher install reitzig/sdkman-for-fish'
     fi
-    sdk install java 17.0.2-tem # https://whichjdk.com/#adoptium-eclipse-temurin
+    sdk install java 18.0.2-tem # https://whichjdk.com/#adoptium-eclipse-temurin
     yes | sdk upgrade java
 
     # === Manual color ==