From 6a850fe3f92992110d26b270a7867827d74d65b8 Mon Sep 17 00:00:00 2001 From: JKANetwork Date: Mon, 13 Feb 2017 00:15:58 +0100 Subject: [PATCH] edit --- installer/installer.sh | 19 ++++++++++--------- 1 file changed, 10 insertions(+), 9 deletions(-) diff --git a/installer/installer.sh b/installer/installer.sh index 032b25f..abd5b0d 100755 --- a/installer/installer.sh +++ b/installer/installer.sh @@ -57,9 +57,11 @@ function comm { if [[ $? != "0" ]];then echo "[FAILED] $1" echo "[FAILED] $1" >> /tmp/install.log - elif [ $? == "0" ] && [[ $multic == "0" || $multic == "3" ]];then - echo "[ OK ] $1" - echo "[ OK ] $1" >> /tmp/install.log + elif [ $? == "0" ];then + if [[ $multic == "0" || $multic == "3" ]];then + echo "[ OK ] $1" + echo "[ OK ] $1" >> /tmp/install.log + fi fi } @@ -655,7 +657,6 @@ function keyboardlayout { # Prepare system for install - if [[ ! -f "jkarch" ]];then #Prepare system before install dialog --title "JKArch install script" --msgbox "Starting installation, please wait" 15 60 @@ -665,12 +666,12 @@ if [[ ! -f "jkarch" ]];then comm "Grow cowspace for installer" "1" "sudo" "mount -o remount,size=700M /run/archiso/cowspace" #Enable pacman - comm "Configuring pacman" "1" "sudo" "pacman-key --init" "0" - comm "Configuring pacman" "1" "sudo" "pacman-key --populate" "0" - comm "Configuring pacman" "1" "sudo" "pacman -Sy archlinux-keyring --noconfirm" "1" + comm "Configuring pacman" "1" "sudo" "pacman-key --init" "1" + comm "Configuring pacman" "1" "sudo" "pacman-key --populate" "2" + comm "Configuring pacman" "1" "sudo" "pacman -Sy archlinux-keyring --noconfirm" "3" - comm "Selecting mirrors" "1" "sudo" "pacman -S reflector --noconfirm" "0" - comm "Selecting mirrors" "1" "sudo" "reflector --verbose -l 6 --sort rate --save /etc/pacman.d/mirrorlist" "1" + comm "Selecting mirrors" "1" "sudo" "pacman -S reflector --noconfirm" "1" + comm "Selecting mirrors" "1" "sudo" "reflector --verbose -l 6 --sort rate --save /etc/pacman.d/mirrorlist" "3" #Delete programs (For not updating it) sudo pacman -R clonezilla darkhttpd diffutils grml-zsh-config irssi linux-atm lvm2 man-db man-pages mc ndisc6 nmap smartmontools testdisk vi vim vim-runtime openconnect pcsclite python2 python reflector --noconfirm