diff --git a/installer/installer.sh b/installer/installer.sh index abd5b0d..d87d4bb 100755 --- a/installer/installer.sh +++ b/installer/installer.sh @@ -1,6 +1,9 @@ #!/bin/bash ## Note: Some text editors in some lines its wrong the "markup color" because much '"'($) things. +# Run all from /root +cd /root/ + # Funtions function pause { @@ -57,11 +60,9 @@ function comm { if [[ $? != "0" ]];then echo "[FAILED] $1" echo "[FAILED] $1" >> /tmp/install.log - elif [ $? == "0" ];then - if [[ $multic == "0" || $multic == "3" ]];then - echo "[ OK ] $1" - echo "[ OK ] $1" >> /tmp/install.log - fi + elif [[ $multic == "0" || $multic == "3" ]];then + echo "[ OK ] $1" + echo "[ OK ] $1" >> /tmp/install.log fi } @@ -656,7 +657,7 @@ function keyboardlayout { ##End of declaring functions, start of script -# Prepare system for install +# Prepare system for install if [[ ! -f "jkarch" ]];then #Prepare system before install dialog --title "JKArch install script" --msgbox "Starting installation, please wait" 15 60 @@ -693,8 +694,7 @@ if [[ ! -f "jkarch" ]];then sudo rm -rf /var/cache/pacman/pkg/* #Download translations - wget -nv https://gitlab.com/JKANetwork/JKArch/raw/master/installer/translations.sh -O translations.sh - source translations.sh + wget -nv https://gitlab.com/JKANetwork/JKArch/raw/master/installer/translations.sh -O /root/translations.sh # No black screensaver setterm -blank 0 -powerdown 0 -powersave off @@ -709,8 +709,10 @@ if [[ ! -f "jkarch" ]];then fi -#Start install +## Start install +# Load translations +source translations.sh #First of all, the language idiom=`dialog --stdout --nocancel --backtitle "JKArch Instalation" --title "Language selection" --menu "Select your language / Selecciona tu idioma" 0 70 5 1 "Spanish (es)" 2 "English (en) (In progress)"`