diff options
Diffstat (limited to 'archfi')
| -rw-r--r-- | archfi | 60 |
1 files changed, 32 insertions, 28 deletions
@@ -12,7 +12,7 @@ # referance : https://wiki.archlinux.org/index.php/Installation_guide -apptitle="Arch Linux Fast Install (archfi) - Version: 2019.12.15.00.04.07 (GPLv3)" +apptitle="Arch Linux Fast Install (archfi) - Version: 2020.03.09.20.29.12 (GPLv3)" baseurl=https://raw.githubusercontent.com/MatMoul/archfi/master skipfont="0" @@ -83,6 +83,7 @@ chooselanguage(){ options+=("English" "(By MatMoul)") options+=("French" "(By MatMoul)") options+=("German" "(By untergrundbiber)") + options+=("Greek" "(By quelotic)") options+=("Italian" "(By thegoldgoat)") options+=("Hungarian" "(By KardiWeb)") options+=("Polish" "(By dawidd6)") @@ -105,7 +106,7 @@ chooselanguage(){ fi font= if [ "$(cat /etc/locale.gen | grep ""#${locale}"")" != "" ]; then - sed -i "/${locale}/s/^#//g" /etc/locale.gen + sed -i "/#${locale}/s/^#//g" /etc/locale.gen locale-gen fi export LANG=${locale} @@ -565,13 +566,13 @@ formatswapdevice(){ formatdevice(){ options=() options+=("btrfs" "") - options+=("reiserfs" "") options+=("ext4" "") options+=("ext3" "") options+=("ext2" "") options+=("xfs" "") options+=("f2fs" "") options+=("jfs" "") + options+=("reiserfs" "") if [ ! "${3}" = "noluks" ]; then options+=("luks" "encrypted") fi @@ -599,10 +600,6 @@ formatdevice(){ umount /mnt fi ;; - reiserfs) - echo "mkfs.reiserfs -f ${2}" - mkfs.reiserfs -f ${2} - ;; ext4) echo "mkfs.ext4 ${2}" mkfs.ext4 ${2} @@ -627,6 +624,10 @@ formatdevice(){ echo "mkfs.xfs -f ${2}" mkfs.jfs -f ${2} ;; + reiserfs) + echo "mkfs.reiserfs -f ${2}" + mkfs.reiserfs -f ${2} + ;; luks) echo "${txtcreateluksdevice}" echo "cryptsetup luksFormat ${2}" @@ -727,8 +728,7 @@ installmenu(){ options=() options+=("${txtselectmirrorsbycountry}" "(${txtoptional})") options+=("${txteditmirrorlist}" "(${txtoptional})") - options+=("${txtinstallarchlinux}" "pacstrap base kernel") - options+=("${txtinstallfirmware}" "(${txtoptional}) pacstrap linux-firmware") + options+=("${txtinstallarchlinux}" "pacstrap base kernel firmwares") options+=("${txtconfigarchlinux}" "") sel=$(whiptail --backtitle "${apptitle}" --title "${txtinstallmenu}" --menu "" --cancel-button "${txtunmount}" --default-item "${nextitem}" 0 0 0 \ "${options[@]}" \ @@ -745,13 +745,9 @@ installmenu(){ ;; "${txtinstallarchlinux}") if(installbase) then - nextitem="${txtinstallfirmware}" + nextitem="${txtconfigarchlinux}" fi ;; - "${txtinstallfirmware}") - installfirmware - nextitem="${txtconfigarchlinux}" - ;; "${txtconfigarchlinux}") archmenu nextitem="${txtconfigarchlinux}" @@ -798,18 +794,22 @@ installbase(){ else return 1 fi + options=() + options+=("linux-firmware" "(${txtoptional})" on) + sel=$(whiptail --backtitle "${apptitle}" --title "Firmwares" --checklist "" 0 0 0 \ + "${options[@]}" \ + 3>&1 1>&2 2>&3) + if [ ! "$?" = "0" ]; then + return 1 + fi + for itm in $sel; do + pkgs="$pkgs $(echo $itm | sed 's/"//g')" + done echo "pacstrap /mnt ${pkgs}" pacstrap /mnt ${pkgs} pressanykey } -installfirmware(){ - clear - echo "pacstrap /mnt linux-firmware" - pacstrap /mnt linux-firmware - pressanykey -} - unmountdevices(){ clear echo "umount -R /mnt" @@ -1040,8 +1040,8 @@ archsetlocale(){ echo "LANG=${locale}.UTF-8" > /mnt/etc/locale.conf echo "echo \"LC_COLLATE=C\" >> /mnt/etc/locale.conf" echo "LC_COLLATE=C" >> /mnt/etc/locale.conf - echo "sed -i '/"${locale}".UTF-8/s/^#//g' /mnt/etc/locale.gen" - sed -i '/'${locale}'.UTF-8/s/^#//g' /mnt/etc/locale.gen + echo "sed -i '/#${locale}.UTF-8/s/^#//g' /mnt/etc/locale.gen" + sed -i '/#'${locale}'.UTF-8/s/^#//g' /mnt/etc/locale.gen archchroot setlocale pressanykey fi @@ -1830,14 +1830,18 @@ while (( "$#" )); do --help) echo "archfi" echo "------" - echo "-sf | --skip-font Skip setfont from language files" - echo "-efiX -efi0 : disable EFI, -efi1 efi inst, -efi2 efi hybrid inst" - echo "-t | --test ghusername ghbranch Test language files" + echo "-sf | --skip-font Skip setfont from language files" + echo "-efiX -efi0 : disable EFI, -efi1 efi inst, -efi2 efi hybrid inst" + echo "-t | --test ghusername ghbranch Test archfi script and language" exit 0 ;; -sf | --skip-font) skipfont=1;; - -t | --test) baseurl="https://raw.githubusercontent" - baseurl="${baseurl}.com/""${2}/archfi/${3}";; + -t | --test) + wget -O archfi https://raw.githubusercontent.com/${2}/archfi/${3}/archfi + sh archfi -tt ${2} ${3} + exit 0 + ;; + -tt) baseurl="https://raw.githubusercontent.com/${2}/archfi/${3}";; -efi0) efimode=0;; -efi1) eficomputer=1 |