jkanetwork/JKArch
1
0
Fork 0
mirror of https://gitlab.com/JKANetwork/JKArch.git synced 2026-02-15 09:41:31 +01:00
Code Issues Releases Wiki Activity

Fix

Browse Source
This commit is contained in:
JKA Network
2017-02-13 18:47:32 +01:00
parent 6a850fe3f9
commit 62ad54a4ca
1 changed files with 11 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
installer/installer.sh
View File

@@ -1,6 +1,9 @@
#!/bin/bash #!/bin/bash
## Note: Some text editors in some lines its wrong the "markup color" because much '"'($) things. ## Note: Some text editors in some lines its wrong the "markup color" because much '"'($) things.
# Run all from /root
cd /root/
# Funtions # Funtions
function pause { function pause {
@@ -57,11 +60,9 @@ function comm {
if [[ $? != "0" ]];then if [[ $? != "0" ]];then
echo "[FAILED] $1" echo "[FAILED] $1"
echo "[FAILED] $1" >> /tmp/install.log echo "[FAILED] $1" >> /tmp/install.log
elif [ $? == "0" ];then elif [[ $multic == "0" || $multic == "3" ]];then
if [[ $multic == "0" || $multic == "3" ]];then echo "[ OK ] $1"
echo "[ OK ] $1" echo "[ OK ] $1" >> /tmp/install.log
echo "[ OK ] $1" >> /tmp/install.log
fi
fi fi
} }
@@ -656,7 +657,7 @@ function keyboardlayout {
##End of declaring functions, start of script ##End of declaring functions, start of script
# Prepare system for install # Prepare system for install
if [[ ! -f "jkarch" ]];then if [[ ! -f "jkarch" ]];then
#Prepare system before install #Prepare system before install
dialog --title "JKArch install script" --msgbox "Starting installation, please wait" 15 60 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/* sudo rm -rf /var/cache/pacman/pkg/*
#Download translations #Download translations
wget -nv https://gitlab.com/JKANetwork/JKArch/raw/master/installer/translations.sh -O translations.sh wget -nv https://gitlab.com/JKANetwork/JKArch/raw/master/installer/translations.sh -O /root/translations.sh
source translations.sh
# No black screensaver # No black screensaver
setterm -blank 0 -powerdown 0 -powersave off setterm -blank 0 -powerdown 0 -powersave off
@@ -709,8 +709,10 @@ if [[ ! -f "jkarch" ]];then
fi fi
#Start install ## Start install
# Load translations
source translations.sh
#First of all, the language #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)"` 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)"`