From 806f519739e86c3f3de99b5269782b8c531719a4 Mon Sep 17 00:00:00 2001 From: grm34 Date: Fri, 27 Mar 2020 02:27:15 +0100 Subject: [PATCH 01/37] dev --- README.md | 2 +- archboot | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index a2d4ac5e..f3f781bc 100644 --- a/README.md +++ b/README.md @@ -20,7 +20,7 @@ The only thing you need is one **USB bootable device** of [Arch Linux](https://m **3.** For AZERTY keyboard run: `loqdkeys fr` -**4.** Download and follow the instructions `wget tiny.cc/archboot; sh archboot` +**4.** Download and follow the instructions `wget tiny.cc/archboot-dev; sh archboot-dev` ## Wiki diff --git a/archboot b/archboot index e3046031..88830c9e 100644 --- a/archboot +++ b/archboot @@ -1,7 +1,7 @@ #!/bin/bash __appname__="archboot" __version__="v2.8.5" -__branch__="master" +__branch__="dev" __author__="@grm34" __license__="Apache v2.0 License" From 94f58adda60377b533aed3d79312e465b505d394 Mon Sep 17 00:00:00 2001 From: grm34 Date: Fri, 27 Mar 2020 16:41:57 +0100 Subject: [PATCH 02/37] Remove Bumblebee support --- .markdownlint.json | 5 --- README.md | 27 ++++++------- src/apps/vga_apps | 9 ----- src/arch/vga | 96 ++++++++++++++-------------------------------- 4 files changed, 43 insertions(+), 94 deletions(-) delete mode 100644 .markdownlint.json diff --git a/.markdownlint.json b/.markdownlint.json deleted file mode 100644 index 7fa3b745..00000000 --- a/.markdownlint.json +++ /dev/null @@ -1,5 +0,0 @@ -{ - "MD013": false, - "MD033": false, - "MD041": false -} diff --git a/README.md b/README.md index f3f781bc..2986af72 100644 --- a/README.md +++ b/README.md @@ -1,10 +1,14 @@ - - - +# [![archboot](https://www.archboot.org/assets/images/logo.png)](https://www.archboot.org) -[![version](https://img.shields.io/badge/version-v2.8.5-blue.svg)](https://github.com/grm34/archboot/releases) [![Build Status](https://travis-ci.org/grm34/archboot.svg?branch=master)](https://travis-ci.org/grm34/archboot) [![author](https://img.shields.io/badge/author-grm34-red.svg)](https://github.com/grm34) [![license](https://img.shields.io/badge/license-Apache%202.0-blue.svg)](https://github.com/grm34/archboot/blob/master/LICENSE) [![telegram](https://img.shields.io/badge/Telegram-chat-red)](https://t.me/archboot) [![maintenance](https://img.shields.io/maintenance/yes/2020.svg)](https://github.com/grm34/archboot/pulse) +[![version](https://img.shields.io/badge/version-v2.8.5-blue.svg)](https://github.com/grm34/archboot/releases)[![Build Status](https://travis-ci.org/grm34/archboot.svg?branch=master)](https://travis-ci.org/grm34/archboot)[![author](https://img.shields.io/badge/author-grm34-red.svg)](https://github.com/grm34)[![license](https://img.shields.io/badge/license-Apache%202.0-blue.svg)](https://github.com/grm34/archboot/blob/master/LICENSE)[![telegram](https://img.shields.io/badge/Telegram-chat-red)](https://t.me/archboot)[![maintenance](https://img.shields.io/maintenance/yes/2020.svg)](https://github.com/grm34/archboot/pulse) -Arch Linux is a light and fast distribution whose concept is to remain as simple as possible. In the same purpose, this script performs minimalist installation, it only installs the required packages in order to give free choice to the user. Pretty simple, it just prompts for language, hostname, username, which disk to use, required partitions size and if you wish to install a desktop environment. According to the chosen one and in order to get complete support, additional packages may be required. +Arch Linux is a light and fast distribution whose concept is to remain as +simple as possible. In the same purpose, this script performs minimalist +installation, it only installs the required packages in order to give +free choice to the user. Pretty simple, it just prompts for language, +hostname, username, which disk to use, required partitions size and +if you wish to install a desktop environment. According to the chosen one +and in order to get complete support, additional packages may be required. ## Requirements @@ -14,13 +18,13 @@ The only thing you need is one **USB bootable device** of [Arch Linux](https://m ## Usage -**1.** Reboot your computer, open Boot Selection Menu and boot on the USB device +**1.** Reboot computer, open Boot Selection Menu and boot on the USB device **2.** On the install menu of Arch Linux, select Boot Arch Linux (x86_64) **3.** For AZERTY keyboard run: `loqdkeys fr` -**4.** Download and follow the instructions `wget tiny.cc/archboot-dev; sh archboot-dev` +**4.** Download and run archboot: `wget tiny.cc/archboot-dev; sh archboot-dev` ## Wiki @@ -39,15 +43,12 @@ Take a look at **/var/log/archboot** for logs: `cat /var/log/archboot/archboot*. ## Screenshot - - - +[![screenchot](https://www.archboot.org/assets/images/screenshot.png)](https://www.archboot.org/assets/images/screenshot.png) ## Official Documentation -* [Arch Linux Installation Guide](https://wiki.archlinux.org/index.php/Installation_guide) for the official documentation -* [VGA Drivers](https://wiki.archlinux.org/index.php/Xorg#Driver_installation) open source and proprietary drivers support -* [Bumblebee](https://wiki.archlinux.org/index.php/Bumblebee) available in case of Intel+nVidia controller +* [Arch Linux Official Installation Guide](https://wiki.archlinux.org/index.php/Installation_guide) +* [VGA Drivers](https://wiki.archlinux.org/index.php/Xorg#Driver_installation) support open source & proprietary * [File System](https://wiki.archlinux.org/index.php/file_systems) (may be required if not included in DE) * [Multimedia](https://wiki.archlinux.org/index.php/List_of_applications/Multimedia) (may be required if not included in DE) * [Cups](https://wiki.archlinux.org/index.php/CUPS) (may be required if not included in DE) diff --git a/src/apps/vga_apps b/src/apps/vga_apps index 0c2cd095..34e0dfcb 100644 --- a/src/apps/vga_apps +++ b/src/apps/vga_apps @@ -43,14 +43,5 @@ export _hard_video_nouveau="libva-vdpau-driver mesa-vdpau" export _openGL_nvidia="nvidia-utils" export _hard_video_nvidia="libva-vdpau-driver" -# BUMBLEBEE DRIVER PACKAGES -# ============================================================================ - -# Driver Bumblebee (open source) -export _bumblebee_nvidia="bumblebee xf86-video-intel xf86-video-nouveau" - -# Driver Bumblebee (proprietary) -export _bumblebee_nouveau="bumblebee xf86-video-intel xf86-video-nvidia" - # archboot by grm34 under Apache v2.0 License. # ============================================================================ diff --git a/src/arch/vga b/src/arch/vga index d8263cb3..73c8f7cf 100644 --- a/src/arch/vga +++ b/src/arch/vga @@ -4,7 +4,6 @@ # ============================================================================ # Here we scan for 3D VGA Controller(s) to install appropriate drivers # with OpenGL and Hardware Acceleration support. -# In case of dual controller system (intel+nvidia) Bumblebee is available. # User can choose to install proprietary drivers instead of open source. # All steps are described in the official documentation: # https://wiki.archlinux.org/index.php/Xorg#Driver_installation @@ -13,82 +12,49 @@ _scan_vga_controller() { _info "Scanning 3D VGA Controller" - vga_number=$(lspci | grep -e VGA -e 3D | wc -l) - # Scan for intel+nvidia controller - lspci | grep -e VGA -e 3D | grep -ie nvidia | grep -i intel - - # If true ask for Bumblebee - if [[ $? -eq 0 && ${vga_number} -ge "2" ]]; then - - _note "Nvidia + Intel Controller detected!" - _confirm "Do you wish to install and activate Bumblebee?" + # NVIDIA + nvidia_card=$(lspci | grep -e VGA -e 3D | grep -ie nvidia) + if [[ $? -eq 0 ]]; then + _note "${nvidia_card##*: } detected!" + _confirm "Use Nvidia proprietary drivers?" case ${confirm} in y|Y) - unset confirm - _confirm "Use Nvidia proprietary drivers?" - case ${confirm} in - y|Y) - export vga_driver="bumblebee_nvidia" - export openGL="openGL_nvidia" - export hard_video="hard_video_nvidia" - ;; - *) - export vga_driver="bumblebee_nouveau" - export openGL="openGL_nouveau" - export hard_video="hard_video_nouveau" - ;; - esac + export vga_driver="nvidia" + export openGL="openGL_nvidia" + export hard_video="hard_video_nvidia" + ;; + *) + export vga_driver="nouveau" + export openGL="openGL_nouveau" + export hard_video="hard_video_nouveau" ;; esac unset confirm - - # Otherwise detect appropriate drivers else - # NVIDIA - nvidia_card=$(lspci | grep -e VGA -e 3D | grep -ie nvidia) + # AMD / ATI + amd_card=$(lspci | grep -e VGA -e 3D | grep -e ATI -e AMD) if [[ $? -eq 0 ]]; then - _note "${nvidia_card##*: } detected!" - _confirm "Use Nvidia proprietary drivers?" - case ${confirm} in - y|Y) - export vga_driver="nvidia" - export openGL="openGL_nvidia" - export hard_video="hard_video_nvidia" - ;; - *) - export vga_driver="nouveau" - export openGL="openGL_nouveau" - export hard_video="hard_video_nouveau" - ;; - esac - unset confirm + _note "${amd_card##*: } detected!" + export vga_driver="amd" + export openGL="openGL_amd" + export hard_video="hard_video_amd" + else - # AMD / ATI - amd_card=$(lspci | grep -e VGA -e 3D | grep -e ATI -e AMD) + # INTEL + intel_card=$(lspci | grep -e VGA -e 3D | grep -i intel) if [[ $? -eq 0 ]]; then - _note "${amd_card##*: } detected!" - export vga_driver="amd" - export openGL="openGL_amd" - export hard_video="hard_video_amd" + _note "${intel_card##*: } detected!" + export vga_driver="intel" + export openGL="openGL_intel" + export hard_video="hard_video_intel" + # DEFAULT else - - # INTEL - intel_card=$(lspci | grep -e VGA -e 3D | grep -i intel) - if [[ $? -eq 0 ]]; then - _note "${intel_card##*: } detected!" - export vga_driver="intel" - export openGL="openGL_intel" - export hard_video="hard_video_intel" - - # DEFAULT - else - _note "Controller not found, default driver will be used" - export vga_driver="default" - fi + _note "Controller not found, default driver will be used" + export vga_driver="default" fi fi fi @@ -100,10 +66,6 @@ _install_vga_controller() { _info "Installing 3D VGA Driver" install_vga="_${vga_driver}" _chroot "pacman --noconfirm -S ${!install_vga}" - if [[ ${vga_driver} =~ [^bumblebee_]* ]]; then - _info "Enabling Bumblebee service" - _chroot "systemctl enable bumblebeed" - fi # OpenGL & Hardware Video Acceleration if [[ ${vga_driver} != "default" ]]; then From 51c50cc38f2ac5e1a98444e52c37cb3731844d8e Mon Sep 17 00:00:00 2001 From: grm34 Date: Fri, 27 Mar 2020 17:05:39 +0100 Subject: [PATCH 03/37] modsetting support --- archboot | 21 ++++++++++++++++++--- src/arch/vga | 2 +- 2 files changed, 19 insertions(+), 4 deletions(-) diff --git a/archboot b/archboot index 88830c9e..d092c30e 100644 --- a/archboot +++ b/archboot @@ -179,6 +179,7 @@ _end() { # Once done we could ask for user variables and stored them to run install. # In case of desktop environment, we import additional sources and we # scan for 3D VGA controller(s) to define appropriate drivers. +# User can choose not to install VGA driver and in this case modsetting used # ============================================================================ # Display archboot banner @@ -240,8 +241,17 @@ if [[ ! -z ${desktop+x} ]]; then source ./vga; source ./desktop; source ./display source ./vga_apps; source ./desktop_apps; source ./display_apps - # Scan VGA Controller and set appropriate driver [src/arch/vga] - _scan_vga_controller + # VGA Driver or MODSETTING + _note "select NO if you want to use modsetting" + _confirm "Do you wish to install VGA Driver?" + case ${confirm} in + y|Y) + # Scan VGA Controller and set appropriate driver [src/arch/vga] + _scan_vga_controller + modsetting="true" + ;; + esac + unset confirm fi # Prepare the system @@ -283,7 +293,12 @@ case ${confirm} in # Install Arch Linux base system (_base; _bootloader) 2>&1 | tee -a ${log} - # Install desktop environment + # Install VGA Driver + if [[ ! -z ${modsetting+x} ]]; then + (_install_vga_driver) 2>&1 | tee -a ${log} + fi + + # Install desktop environment & display manager if [[ ! -z ${desktop+x} ]]; then (_install_vga_controller; _install_desktop_environment; \ _display_manager; _desktop_settings) 2>&1 | tee -a ${log} diff --git a/src/arch/vga b/src/arch/vga index 73c8f7cf..3afd2d90 100644 --- a/src/arch/vga +++ b/src/arch/vga @@ -60,7 +60,7 @@ _scan_vga_controller() { fi } -_install_vga_controller() { +_install_vga_driver() { # VGA Controller _info "Installing 3D VGA Driver" From 29a3df22005204e89eeabbcf2540d624590887c0 Mon Sep 17 00:00:00 2001 From: grm34 Date: Fri, 27 Mar 2020 17:08:55 +0100 Subject: [PATCH 04/37] Update README.md --- README.md | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/README.md b/README.md index 2986af72..6aa4f8a9 100644 --- a/README.md +++ b/README.md @@ -47,8 +47,7 @@ Take a look at **/var/log/archboot** for logs: `cat /var/log/archboot/archboot*. ## Official Documentation -* [Arch Linux Official Installation Guide](https://wiki.archlinux.org/index.php/Installation_guide) -* [VGA Drivers](https://wiki.archlinux.org/index.php/Xorg#Driver_installation) support open source & proprietary +* [Arch Linux Installation Guide](https://wiki.archlinux.org/index.php/Installation_guide) * [File System](https://wiki.archlinux.org/index.php/file_systems) (may be required if not included in DE) * [Multimedia](https://wiki.archlinux.org/index.php/List_of_applications/Multimedia) (may be required if not included in DE) * [Cups](https://wiki.archlinux.org/index.php/CUPS) (may be required if not included in DE) From e135fb05ba73969cd9b61264dafffc5e6400e5d8 Mon Sep 17 00:00:00 2001 From: grm34 Date: Fri, 27 Mar 2020 17:28:19 +0100 Subject: [PATCH 05/37] Update README.md --- README.md | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/README.md b/README.md index 6aa4f8a9..d4ba0078 100644 --- a/README.md +++ b/README.md @@ -14,7 +14,7 @@ and in order to get complete support, additional packages may be required. The only thing you need is one **USB bootable device** of [Arch Linux](https://mir.archlinux.fr/iso/latest) -* USB Boot instruction for [Windows](https://rufus.ie/) or [Linux](https://wiki.archlinux.org/index.php/USB_flash_installation_media) +* *USB Boot instruction for* [Windows](https://rufus.ie/) *or* [Linux](https://wiki.archlinux.org/index.php/USB_flash_installation_media) ## Usage @@ -22,9 +22,9 @@ The only thing you need is one **USB bootable device** of [Arch Linux](https://m **2.** On the install menu of Arch Linux, select Boot Arch Linux (x86_64) -**3.** For AZERTY keyboard run: `loqdkeys fr` +**3.** For AZERTY keyboard run: *`loqdkeys fr`* -**4.** Download and run archboot: `wget tiny.cc/archboot-dev; sh archboot-dev` +**4.** Download and run archboot: *`wget tiny.cc/archboot-dev; sh archboot-dev`* ## Wiki @@ -39,7 +39,7 @@ The only thing you need is one **USB bootable device** of [Arch Linux](https://m ## Logs -Take a look at **/var/log/archboot** for logs: `cat /var/log/archboot/archboot*.log` +Take a look at **/var/log/archboot**: *`cat /var/log/archboot/archboot*.log`* ## Screenshot @@ -48,11 +48,11 @@ Take a look at **/var/log/archboot** for logs: `cat /var/log/archboot/archboot*. ## Official Documentation * [Arch Linux Installation Guide](https://wiki.archlinux.org/index.php/Installation_guide) -* [File System](https://wiki.archlinux.org/index.php/file_systems) (may be required if not included in DE) -* [Multimedia](https://wiki.archlinux.org/index.php/List_of_applications/Multimedia) (may be required if not included in DE) -* [Cups](https://wiki.archlinux.org/index.php/CUPS) (may be required if not included in DE) -* [Sane](https://wiki.archlinux.org/index.php/SANE) (may be required if not included in DE) -* [Samba](https://wiki.archlinux.org/index.php/Samba) (may be required if not included in DE) +* [File System](https://wiki.archlinux.org/index.php/file_systems) *(may be required if not included in DE)* +* [Multimedia](https://wiki.archlinux.org/index.php/List_of_applications/Multimedia) *(may be required if not included in DE)* +* [Cups](https://wiki.archlinux.org/index.php/CUPS) *(may be required if not included in DE)* +* [Sane](https://wiki.archlinux.org/index.php/SANE) *(may be required if not included in DE)* +* [Samba](https://wiki.archlinux.org/index.php/Samba) *(may be required if not included in DE)* [![forthebadge](https://forthebadge.com/images/badges/built-with-love.svg)](https://forthebadge.com) [![forthebadge](https://forthebadge.com/images/badges/for-you.svg)](https://forthebadge.com) From f42a18d44b47fcdd0cef8a9c421507b2cf010766 Mon Sep 17 00:00:00 2001 From: grm34 Date: Fri, 27 Mar 2020 18:34:08 +0100 Subject: [PATCH 06/37] Update comments --- src/arch/user | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/arch/user b/src/arch/user index 84f33ccf..53025a09 100644 --- a/src/arch/user +++ b/src/arch/user @@ -17,7 +17,7 @@ # Budgie - Enlightenment - MATE - LXQt # Display Man....: Gdm - LightDM - Sddm - Lxdm - Xdm # -# Then we handle user rights: ALL power in sudoers and added to all groups. +# Then we handle user rights: granted in sudoers and added to all groups. # ============================================================================ _ask_user_variables() { From 62f387476b92dd4dba97c073961dc0eca3dbd0c9 Mon Sep 17 00:00:00 2001 From: grm34 Date: Fri, 27 Mar 2020 18:48:54 +0100 Subject: [PATCH 07/37] Update function ident --- archboot | 22 +++++++++++----------- src/arch/base | 2 +- src/arch/bootloader | 2 +- src/arch/desktop | 2 +- src/arch/display | 2 +- src/arch/partition | 4 ++-- src/arch/user | 4 ++-- src/arch/vga | 2 +- 8 files changed, 20 insertions(+), 20 deletions(-) diff --git a/archboot b/archboot index d092c30e..2c50db63 100644 --- a/archboot +++ b/archboot @@ -201,7 +201,7 @@ case ${confirm} in _info "Downloading base sources" _wget ${_url}/src/arch/base # to install Base system _wget ${_url}/src/arch/bootloader # to install Grub2 bootloader - _wget ${_url}/src/arch/firmware # to set partitions settings + _wget ${_url}/src/arch/firmware # to get user firmware _wget ${_url}/src/arch/mirrorlist # to get mirrorlist & timezone _wget ${_url}/src/arch/mounting # to mount partitions & swap _wget ${_url}/src/arch/partition # to create table & partitions @@ -222,7 +222,7 @@ source ./base; source ./bootloader; source ./firmware; source ./mirrorlist source ./mounting; source ./partition; source ./user; source ./system_apps # Get required variables [src/arch/user] -_ask_user_variables +_get_user_variables # If Desktop Environment if [[ ! -z ${desktop+x} ]]; then @@ -241,13 +241,13 @@ if [[ ! -z ${desktop+x} ]]; then source ./vga; source ./desktop; source ./display source ./vga_apps; source ./desktop_apps; source ./display_apps - # VGA Driver or MODSETTING + # VGA Driver or MODSETTING? _note "select NO if you want to use modsetting" _confirm "Do you wish to install VGA Driver?" case ${confirm} in y|Y) - # Scan VGA Controller and set appropriate driver [src/arch/vga] - _scan_vga_controller + # Get VGA Controller [src/arch/vga] + _get_vga_controller modsetting="true" ;; esac @@ -262,10 +262,10 @@ _note "WARNING! Enter NO only if partitions properly created and formated" _confirm "Do you wish to install Arch Linux on a dedicated disk?" case ${confirm} in y|Y) - _partition + _default_partitioning ;; *) - _custom_partition + _custom_partitioning ;; esac unset confirm @@ -291,7 +291,7 @@ case ${confirm} in y|Y) # Install Arch Linux base system - (_base; _bootloader) 2>&1 | tee -a ${log} + (_install_base; _install_bootloader) 2>&1 | tee -a ${log} # Install VGA Driver if [[ ! -z ${modsetting+x} ]]; then @@ -300,13 +300,13 @@ case ${confirm} in # Install desktop environment & display manager if [[ ! -z ${desktop+x} ]]; then - (_install_vga_controller; _install_desktop_environment; \ - _display_manager; _desktop_settings) 2>&1 | tee -a ${log} + (_install_desktop_environment; _install_display_manager; \ + _configure_desktop_environment) 2>&1 | tee -a ${log} fi # User rights if [[ ! -z ${power+x} ]]; then - (_user_power) 2>&1 | tee -a ${log} + (_grant_user_power) 2>&1 | tee -a ${log} fi # Logfile path diff --git a/src/arch/base b/src/arch/base index 74cf9254..e184af32 100644 --- a/src/arch/base +++ b/src/arch/base @@ -9,7 +9,7 @@ # User account will be created with previously defined password. # ============================================================================ -_base() { +_install_base() { # Base System _info "Installing base with ${user_kernel} kernel" diff --git a/src/arch/bootloader b/src/arch/bootloader index 86e43b55..948b5c23 100644 --- a/src/arch/bootloader +++ b/src/arch/bootloader @@ -7,7 +7,7 @@ # We also install additional themes for beautifull OS selection menu. # ============================================================================ -_bootloader() { +_install_bootloader() { # Install Grub packages _info "Installing Grub packages" diff --git a/src/arch/desktop b/src/arch/desktop index 39db4712..5d47fea3 100644 --- a/src/arch/desktop +++ b/src/arch/desktop @@ -35,7 +35,7 @@ _install_desktop_environment() { _chroot "pacman --noconfirm -S ${!user_desktop}" } -_desktop_settings() { +_configure_desktop_environment() { # Keyboard layout _info "Setting ${keymap_code} keyboard layout" diff --git a/src/arch/display b/src/arch/display index 98747a7d..f4279d54 100644 --- a/src/arch/display +++ b/src/arch/display @@ -16,7 +16,7 @@ # https://wiki.archlinux.org/index.php/Display_manager # ============================================================================ -_display_manager() { +_install_display_manager() { # Install Display Manager _info "Installing ${display_man}" diff --git a/src/arch/partition b/src/arch/partition index a54637b2..02145477 100644 --- a/src/arch/partition +++ b/src/arch/partition @@ -20,7 +20,7 @@ # https://wiki.archlinux.org/index.php/Partitioning # ============================================================================ -_partition() { +_default_partitioning() { _info "Listing disk and partitions" @@ -141,7 +141,7 @@ _partition() { export _home="/dev/${_disk}${part_order[4]}" } -_custom_partition() { +_custom_partitioning() { _info "Listing disk and partitions" diff --git a/src/arch/user b/src/arch/user index 53025a09..e8b2d56c 100644 --- a/src/arch/user +++ b/src/arch/user @@ -20,7 +20,7 @@ # Then we handle user rights: granted in sudoers and added to all groups. # ============================================================================ -_ask_user_variables() { +_get_user_variables() { # Language until grep -Fxq "${language}" ./language; do @@ -151,7 +151,7 @@ _ask_user_variables() { export USER_name; export USER_passwd } -_user_power() { +_grant_user_power() { # give ALL power to user in sudoers _info "Setting rights for user ${USER_name}" diff --git a/src/arch/vga b/src/arch/vga index 3afd2d90..3d72ab34 100644 --- a/src/arch/vga +++ b/src/arch/vga @@ -9,7 +9,7 @@ # https://wiki.archlinux.org/index.php/Xorg#Driver_installation # ============================================================================ -_scan_vga_controller() { +_get_vga_controller() { _info "Scanning 3D VGA Controller" From c872201e31e6bdc2484dfc1be892bd81a48ab640 Mon Sep 17 00:00:00 2001 From: grm34 Date: Fri, 27 Mar 2020 18:56:28 +0100 Subject: [PATCH 08/37] Update comments --- archboot | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/archboot b/archboot index 2c50db63..81720ec2 100644 --- a/archboot +++ b/archboot @@ -164,7 +164,7 @@ _prompt() { _end } -# Display end of _select(), _confirm() and _prompt() functions +# Display the end of select, confirm and prompt functions _end() { for char in $(seq ${count}); do echo -ne "-" @@ -221,7 +221,7 @@ _info "Importing base sources" source ./base; source ./bootloader; source ./firmware; source ./mirrorlist source ./mounting; source ./partition; source ./user; source ./system_apps -# Get required variables [src/arch/user] +# Get required variables _get_user_variables # If Desktop Environment @@ -241,12 +241,12 @@ if [[ ! -z ${desktop+x} ]]; then source ./vga; source ./desktop; source ./display source ./vga_apps; source ./desktop_apps; source ./display_apps - # VGA Driver or MODSETTING? + # VGA Driver or modsetting? _note "select NO if you want to use modsetting" _confirm "Do you wish to install VGA Driver?" case ${confirm} in y|Y) - # Get VGA Controller [src/arch/vga] + # Get VGA Controller _get_vga_controller modsetting="true" ;; @@ -270,7 +270,7 @@ case ${confirm} in esac unset confirm -# Mount partitions +# Mount _mount_partitions _note "system is ready to rumble! Partitions mounted & swap activated!" From e22a9ec7ea34eb55b9dbe1dfdfc54ec8989a80b7 Mon Sep 17 00:00:00 2001 From: grm34 Date: Fri, 27 Mar 2020 19:12:40 +0100 Subject: [PATCH 09/37] Update comments structure --- archboot | 20 ++++++++++++++------ 1 file changed, 14 insertions(+), 6 deletions(-) diff --git a/archboot b/archboot index 81720ec2..cf35c391 100644 --- a/archboot +++ b/archboot @@ -37,7 +37,7 @@ For more information, take a look at the archboot wiki # select an option, ask some information to the user or to get install logs. # ============================================================================ -# Github url: ${_url} for sources and ${_gh_pages} for images +# Github url for sources and images _url="https://raw.githubusercontent.com/grm34/archboot/${__branch__}" _gh_pages="https://raw.githubusercontent.com/grm34/archboot/gh-pages" @@ -56,7 +56,7 @@ _note() { echo -e "${red}\nNote: ${blue}${1}${nc}" } -# DL show progress bar only +# Download show progress bar only _wget() { wget ${1} -q --show-progress } @@ -93,7 +93,7 @@ _check() { return ${status} } -# Cleanup: delete sources - umount partitions - exit +# Delete sources, umount partitions and exit _cleanup() { echo -e "\nCleaning up archboot..." for source in *; do @@ -172,7 +172,7 @@ _end() { echo -ne "\n==> ${nc}" } -# ARCHBOOT SYSTEM PROCESS +# ARCHBOOT SYSTEM SETTINGS # ============================================================================ # Here we check internet connection before downloading and importing sources. # Sources are sorted by type: applications and scripts [src/apps & src/arch] @@ -224,7 +224,7 @@ source ./mounting; source ./partition; source ./user; source ./system_apps # Get required variables _get_user_variables -# If Desktop Environment +# Desktop Environment if [[ ! -z ${desktop+x} ]]; then # Download desktop sources @@ -254,10 +254,18 @@ if [[ ! -z ${desktop+x} ]]; then unset confirm fi +# ARCHBOOT SYSTEM PREPARE +# ============================================================================ +# Here we get user firmware to set partitions settings and other options. +# Then we set mirrorlist, timezone, clock and logs. +# We could now run partitioning scheme (default or custom). +# And activate SWAP and mount the partitions. +# ============================================================================ + # Prepare the system _firmware; _mirrorlist; _timezone; _clock; _logs -# Manage partitions +# Partitioning _note "WARNING! Enter NO only if partitions properly created and formated" _confirm "Do you wish to install Arch Linux on a dedicated disk?" case ${confirm} in From 8df952edbf4bf6c60ded5761d3ffa73360e23532 Mon Sep 17 00:00:00 2001 From: grm34 Date: Fri, 27 Mar 2020 19:51:01 +0100 Subject: [PATCH 10/37] Refactoring code --- archboot | 38 ++++++++++++++++++++------------------ src/apps/desktop_apps | 2 +- src/apps/display_apps | 2 +- src/apps/system_apps | 2 +- src/apps/vga_apps | 2 +- src/arch/base | 4 ++-- src/arch/bootloader | 2 +- src/arch/desktop | 2 +- src/arch/display | 2 +- src/arch/firmware | 2 +- src/arch/mirrorlist | 6 +++--- src/arch/mounting | 2 +- src/arch/partition | 2 +- src/arch/user | 2 +- src/arch/vga | 2 +- 15 files changed, 37 insertions(+), 35 deletions(-) diff --git a/archboot b/archboot index cf35c391..ddc6b8c0 100644 --- a/archboot +++ b/archboot @@ -2,8 +2,8 @@ __appname__="archboot" __version__="v2.8.5" __branch__="dev" -__author__="@grm34" -__license__="Apache v2.0 License" +__author__="grm34" +__license__="Apache License 2.0" _archboot_banner() { echo -e """${red} @@ -38,8 +38,10 @@ For more information, take a look at the archboot wiki # ============================================================================ # Github url for sources and images -_url="https://raw.githubusercontent.com/grm34/archboot/${__branch__}" -_gh_pages="https://raw.githubusercontent.com/grm34/archboot/gh-pages" +_url=\ +"https://raw.githubusercontent.com/${__author__}/${__appname__}/${__branch__}" +_gh_pages=\ +"https://raw.githubusercontent.com/${__author__}/${__appname__}/gh-pages" # Shell colors red="\e[1;31m"; green="\e[1;32m"; yellow="\e[1;33m" @@ -70,7 +72,7 @@ EOF # Set logfile _logs() { - _info "Setting archboot log" + _info "Setting ${__appname__} log" datetime=$(date '+%d-%m-%Y') log="${__appname__}-${__version__}_${datetime}.log" } @@ -95,7 +97,7 @@ _check() { # Delete sources, umount partitions and exit _cleanup() { - echo -e "\nCleaning up archboot..." + echo -e "\nCleaning up ${__appname__}..." for source in *; do if [[ ${source} =~ ^(base|bootloader|desktop|display|\ firmware|mirrorlist|mounting|partition|user|vga|desktop_apps|\ @@ -127,7 +129,7 @@ _reboot() { # Display error and cleanup _error() { - echo -e "${red}Error: ${yellow}${1} - Please try again!${nc}\n" + echo -e "${red}Error: ${yellow}${1}${nc}\n" _cleanup } @@ -178,20 +180,20 @@ _end() { # Sources are sorted by type: applications and scripts [src/apps & src/arch] # Once done we could ask for user variables and stored them to run install. # In case of desktop environment, we import additional sources and we -# scan for 3D VGA controller(s) to define appropriate drivers. -# User can choose not to install VGA driver and in this case modsetting used +# scan for 3D VGA controller(s) to select appropriate drivers. +# Avaibility not to install VGA driver and fall back to kernel mode setting. # ============================================================================ # Display archboot banner _archboot_banner # Check Internet Connection -_info "Check Internet Connection" +_info "Checking Internet connection" ping -c 1 archlinux.org >/dev/null 2>&1 if [[ $? -eq 0 ]]; then _note "Congratulations, you are connected to Internet!" else - _error "you are not connected to Internet. Ethernet seems not plugged in!" + _error "you are not connected to Internet!" fi # Download base sources @@ -208,7 +210,7 @@ case ${confirm} in _wget ${_url}/src/arch/user # to get user variables _wget ${_url}/src/apps/system_apps # to get system apps _wget ${_url}/conf/language # to get language code - _wget ${_url}/conf/timezone # to get region code + _wget ${_url}/conf/timezone # to get timezone ;; *) exit @@ -241,8 +243,8 @@ if [[ ! -z ${desktop+x} ]]; then source ./vga; source ./desktop; source ./display source ./vga_apps; source ./desktop_apps; source ./display_apps - # VGA Driver or modsetting? - _note "select NO if you want to use modsetting" + # VGA Driver or kernel mode setting? + _note "enter NO to activate kernel mode setting" _confirm "Do you wish to install VGA Driver?" case ${confirm} in y|Y) @@ -266,7 +268,7 @@ fi _firmware; _mirrorlist; _timezone; _clock; _logs # Partitioning -_note "WARNING! Enter NO only if partitions properly created and formated" +_note "enter NO to activate custom partitioning" _confirm "Do you wish to install Arch Linux on a dedicated disk?" case ${confirm} in y|Y) @@ -323,8 +325,7 @@ case ${confirm} in cp "${log}" /mnt/var/log/archboot/ # Success notes - _note "installation successful! // \ -${__appname__} ${__version__} by ${__author__} under ${__license__}" + _note "Arch Linux installation successful!" ;; *) @@ -341,6 +342,7 @@ unset confirm # Telegram chat: t.me/archboot - Have fun, take care and give a star! # ============================================================================ +_note "${__appname__} ${__version__} by ${__author__} under ${__license__}" _confirm "Do you want to reboot your computer now?" case ${confirm} in y|Y) @@ -352,5 +354,5 @@ case ${confirm} in ;; esac -# archboot by grm34 under Apache v2.0 License. +# archboot by grm34 under Apache License 2.0 # ============================================================================ diff --git a/src/apps/desktop_apps b/src/apps/desktop_apps index 9ad700f0..7c1aa7e3 100644 --- a/src/apps/desktop_apps +++ b/src/apps/desktop_apps @@ -50,5 +50,5 @@ export _numlock="numlockx" # Terminal export _term="terminator" -# archboot by grm34 under Apache v2.0 License. +# archboot by grm34 under Apache License 2.0 # ============================================================================ diff --git a/src/apps/display_apps b/src/apps/display_apps index 74718ef1..383eb69f 100644 --- a/src/apps/display_apps +++ b/src/apps/display_apps @@ -18,5 +18,5 @@ export _lxdm="lxdm" # XDM export _xdm="xorg-xdm" -# archboot by grm34 under Apache v2.0 License. +# archboot by grm34 under Apache License 2.0 # ============================================================================ diff --git a/src/apps/system_apps b/src/apps/system_apps index 01eb7be2..52b05280 100644 --- a/src/apps/system_apps +++ b/src/apps/system_apps @@ -22,5 +22,5 @@ iw wpa_supplicant wireless_tools git" # Bootloader export _bootapps="grub os-prober gptfdisk efibootmgr" -# archboot by grm34 under Apache v2.0 License. +# archboot by grm34 under Apache License 2.0 # ============================================================================ diff --git a/src/apps/vga_apps b/src/apps/vga_apps index 34e0dfcb..a66e14eb 100644 --- a/src/apps/vga_apps +++ b/src/apps/vga_apps @@ -43,5 +43,5 @@ export _hard_video_nouveau="libva-vdpau-driver mesa-vdpau" export _openGL_nvidia="nvidia-utils" export _hard_video_nvidia="libva-vdpau-driver" -# archboot by grm34 under Apache v2.0 License. +# archboot by grm34 under Apache License 2.0 # ============================================================================ diff --git a/src/arch/base b/src/arch/base index e184af32..9299307b 100644 --- a/src/arch/base +++ b/src/arch/base @@ -12,7 +12,7 @@ _install_base() { # Base System - _info "Installing base with ${user_kernel} kernel" + _info "Installing base system and ${user_kernel} kernel" user_kernel="_${kernel}" yes '' | pacstrap /mnt ${_arch} ${!user_kernel} @@ -62,5 +62,5 @@ _install_base() { echo '${USER_name}:${USER_passwd}' | chpasswd" } -# archboot by grm34 under Apache v2.0 License. +# archboot by grm34 under Apache License 2.0 # ============================================================================ diff --git a/src/arch/bootloader b/src/arch/bootloader index 948b5c23..5106b89c 100644 --- a/src/arch/bootloader +++ b/src/arch/bootloader @@ -48,5 +48,5 @@ _install_bootloader() { _chroot "grub-mkconfig -o /boot/grub/grub.cfg" } -# archboot by grm34 under Apache v2.0 License. +# archboot by grm34 under Apache License 2.0 # ============================================================================ diff --git a/src/arch/desktop b/src/arch/desktop index 5d47fea3..b1c42da2 100644 --- a/src/arch/desktop +++ b/src/arch/desktop @@ -44,5 +44,5 @@ _configure_desktop_environment() { mv 00-keyboard.conf /mnt/etc/X11/xorg.conf.d/ } -# archboot by grm34 under Apache v2.0 License. +# archboot by grm34 under Apache License 2.0 # ============================================================================ diff --git a/src/arch/display b/src/arch/display index f4279d54..c242f0c4 100644 --- a/src/arch/display +++ b/src/arch/display @@ -83,5 +83,5 @@ _install_display_manager() { fi } -# archboot by grm34 under Apache v2.0 License. +# archboot by grm34 under Apache License 2.0 # ============================================================================ diff --git a/src/arch/firmware b/src/arch/firmware index fa64576e..ad871b0e 100644 --- a/src/arch/firmware +++ b/src/arch/firmware @@ -30,5 +30,5 @@ _firmware() { fi } -# archboot by grm34 under Apache v2.0 License. +# archboot by grm34 under Apache License 2.0 # ============================================================================ diff --git a/src/arch/mirrorlist b/src/arch/mirrorlist index bbf8eb10..cf0f858b 100644 --- a/src/arch/mirrorlist +++ b/src/arch/mirrorlist @@ -12,7 +12,7 @@ _mirrorlist() { # Get user country code from ipinfo.io API - _info "Search for country code" + _info "Searching for country code" country=\ $(curl -s ipinfo.io/ | grep "country" | \ sed 's/ "country": "//' | sed 's/",//') @@ -37,7 +37,7 @@ sed 's/ "country": "//' | sed 's/",//') _timezone() { # Get user timezone from ipinfo.io API - _info "Search for timezone code" + _info "Searching for timezone code" tzone=\ $(curl -s ipinfo.io/ | grep "timezone" | \ sed 's/ "timezone": "//' | sed 's/",//') @@ -58,5 +58,5 @@ sed 's/ "timezone": "//' | sed 's/",//') fi } -# archboot by grm34 under Apache v2.0 License. +# archboot by grm34 under Apache License 2.0 # ============================================================================ diff --git a/src/arch/mounting b/src/arch/mounting index f97cd67b..07ef8a04 100644 --- a/src/arch/mounting +++ b/src/arch/mounting @@ -34,5 +34,5 @@ _mount_partitions() { _check mount ${_home} /mnt/home } -# archboot by grm34 under Apache v2.0 License. +# archboot by grm34 under Apache License 2.0 # ============================================================================ diff --git a/src/arch/partition b/src/arch/partition index 02145477..33b6ec9e 100644 --- a/src/arch/partition +++ b/src/arch/partition @@ -185,5 +185,5 @@ _custom_partitioning() { export _home="/dev/${_hm}" } -# archboot by grm34 under Apache v2.0 License. +# archboot by grm34 under Apache License 2.0 # ============================================================================ diff --git a/src/arch/user b/src/arch/user index e8b2d56c..40988eb8 100644 --- a/src/arch/user +++ b/src/arch/user @@ -167,5 +167,5 @@ _grant_user_power() { done } -# archboot by grm34 under Apache v2.0 License. +# archboot by grm34 under Apache License 2.0 # ============================================================================ diff --git a/src/arch/vga b/src/arch/vga index 3d72ab34..8afc9c21 100644 --- a/src/arch/vga +++ b/src/arch/vga @@ -76,5 +76,5 @@ _install_vga_driver() { fi } -# archboot by grm34 under Apache v2.0 License. +# archboot by grm34 under Apache License 2.0 # ============================================================================ From cb339900936ee561dbbafcdd5c85244a853ea5e2 Mon Sep 17 00:00:00 2001 From: grm34 Date: Fri, 27 Mar 2020 20:00:02 +0100 Subject: [PATCH 11/37] Upadte logging scheme --- archboot | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/archboot b/archboot index ddc6b8c0..681f64dc 100644 --- a/archboot +++ b/archboot @@ -13,7 +13,7 @@ _archboot_banner() { / ___ \| | | (__| | | | |_) | (_) | (_) | |_ /_/ \_\_| \___|_| |_|_.__/ \___/ \___/ \__|${green}${__version__} ${blue} - Welcome in archboot, a script made with love by ${__author__} + Welcome in ${__appname__}, a script made with love by ${__author__} ${nc} Arch Linux is a light and fast distribution whose concept is to remain as simple as possible. In the same purpose @@ -24,7 +24,7 @@ language, hostname, username, which disk to use, required partitions size and if you wish to install a desktop environment. According to the chosen one and in order to get complete support, additional packages may be required -For more information, take a look at the archboot wiki +For more information, take a look at the ${__appname__} wiki """ } @@ -321,8 +321,8 @@ case ${confirm} in # Logfile path _info "Setting logfile path" - mkdir /mnt/var/log/archboot - cp "${log}" /mnt/var/log/archboot/ + mkdir /mnt/var/log/${__appname__} + cp ${log} /mnt/var/log/${__appname__}/ # Success notes _note "Arch Linux installation successful!" From 930a137b5256d40af561027a686f22bbe453cfe0 Mon Sep 17 00:00:00 2001 From: grm34 Date: Fri, 27 Mar 2020 20:13:08 +0100 Subject: [PATCH 12/37] Update comments --- archboot | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/archboot b/archboot index 681f64dc..b758cef9 100644 --- a/archboot +++ b/archboot @@ -28,7 +28,7 @@ For more information, take a look at the ${__appname__} wiki """ } -# ARCHBOOT SYSTEM MANAGEMENT +# ARCHBOOT_SYSTEM SETTINGS # ============================================================================ # Here we defined all required variables and functions to manage archboot. # Variables are pretty simple such as define needed url and colors. @@ -174,7 +174,7 @@ _end() { echo -ne "\n==> ${nc}" } -# ARCHBOOT SYSTEM SETTINGS +# ARCHBOOT_SYSTEM MANAGEMENT # ============================================================================ # Here we check internet connection before downloading and importing sources. # Sources are sorted by type: applications and scripts [src/apps & src/arch] @@ -256,7 +256,7 @@ if [[ ! -z ${desktop+x} ]]; then unset confirm fi -# ARCHBOOT SYSTEM PREPARE +# ARCHBOOT_SYSTEM PREPARE # ============================================================================ # Here we get user firmware to set partitions settings and other options. # Then we set mirrorlist, timezone, clock and logs. @@ -285,7 +285,7 @@ _mount_partitions _note "system is ready to rumble! Partitions mounted & swap activated!" -# ARCHBOOT SYSTEM INSTALLATION +# ARCHBOOT_SYSTEM INSTALLATION # ============================================================================ # At this point system is ready, partitions are created, properly mounted and # user variables stored. We can start Arch Linux installation. @@ -335,7 +335,7 @@ case ${confirm} in esac unset confirm -# ARCHBOOT SYSTEM REBOOT +# ARCHBOOT_SYSTEM REBOOT # ============================================================================ # And here we go! We could now cleanup sources, umount all partitions and # reboot the computer to restart on our fresh Arch Linux installation. From 8e2c34a14c7804703e8b5beca7b8b29c76723b0b Mon Sep 17 00:00:00 2001 From: grm34 Date: Fri, 27 Mar 2020 20:19:53 +0100 Subject: [PATCH 13/37] Update custom partitioning --- src/arch/partition | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/arch/partition b/src/arch/partition index 33b6ec9e..3611f6bb 100644 --- a/src/arch/partition +++ b/src/arch/partition @@ -148,28 +148,28 @@ _custom_partitioning() { # Select boot until [[ ${_bt} =~ ^(sd|hd|nvme0n)[a-z0-9]{1,3}$ ]]; do fdisk -l - _prompt "Enter partition for boot:" "(e.g., sda2, nvme0n1p2)" + _prompt "Enter boot mountpoint:" "(e.g., sda2, nvme0n1p2)" read -r _bt done # Select swap until [[ ${_swp} =~ ^(sd|hd|nvme0n)[a-z0-9]{1,3}$ ]]; do fdisk -l - _prompt "Enter partition for swap:" "(e.g., sda3, nvme0n1p3)" + _prompt "Enter swap mountpoint:" "(e.g., sda3, nvme0n1p3)" read -r _swp done # Select system until [[ ${_sys} =~ ^(sd|hd|nvme0n)[a-z0-9]{1,3}$ ]]; do fdisk -l - _prompt "Enter partition for system:" "(e.g., sda1, nvme0n1p1)" + _prompt "Enter system mountpoint:" "(e.g., sda1, nvme0n1p1)" read -r _sys done # Select home until [[ ${_hm} =~ ^(sd|hd|nvme0n)[a-z0-9]{1,3}$ ]]; do fdisk -l - _prompt "Enter partition for home:" "(e.g., sda4, nvme0n1p4)" + _prompt "Enter home mountpoint:" "(e.g., sda4, nvme0n1p4)" read -r _hm done From 9cf14c1f44977b02570a8a1dc54e1a06ccb4f531 Mon Sep 17 00:00:00 2001 From: grm34 Date: Fri, 27 Mar 2020 21:13:49 +0100 Subject: [PATCH 14/37] Update partitioning scheme --- src/arch/mounting | 2 +- src/arch/partition | 109 +++++++++++++++++++++------------------------ 2 files changed, 51 insertions(+), 60 deletions(-) diff --git a/src/arch/mounting b/src/arch/mounting index 07ef8a04..2709b76b 100644 --- a/src/arch/mounting +++ b/src/arch/mounting @@ -9,7 +9,7 @@ _mount_partitions() { - _info "Mounting partitions & swap" + _info "Mounting partitions and activating swap" # Mount system on /mnt _check mount ${_system} /mnt diff --git a/src/arch/partition b/src/arch/partition index 3611f6bb..f34abd97 100644 --- a/src/arch/partition +++ b/src/arch/partition @@ -41,93 +41,84 @@ _default_partitioning() { # Create MBR or GPT Table fdisk -l /dev/${_disk} _note "WARNING! This will erase the entire drive" - _confirm "Setting ${part_table} partition table on /dev/${_disk}" - if [[ ${confirm} == "y" ]]; then - wipefs -fa /dev/${_disk} - printf ${part_code}"\nw" | fdisk /dev/${_disk} - partprobe /dev/${_disk} - else - _error "aborted by user! HDD dedicated is required." - fi + _confirm "Setting ${part_table} partition table on /dev/${_disk}?" + case ${confirm} in + y|Y|yes|Yes) + wipefs -fa /dev/${_disk} + printf ${part_code}"\nw" | fdisk /dev/${_disk} + partprobe /dev/${_disk} + ;; + *) + _error "aborted by user!" + ;; + esac unset confirm # Get BOOT partition size - until [[ ${boot_size} =~ ^[0-9]{1,3}(M|G){1} \ - || ${boot_size,,} == "y" ]]; do - _note "Partition size {M,G} [default: 512M]" - _prompt "Boot partition size:" "default [y]" + until [[ ${boot_size} =~ ^[0-9]{1,3}(M|G){1}+$ ]]; do + _note "Partition size {M,G} (e.g., 512M)" + _prompt "Boot partition size:" read -r boot_size done - if [[ ${boot_size,,} == "y" ]]; then - boot_size="512M" - fi - # Create BOOT partition on /dev/xxx1 - _info "Setting boot of ${boot_size} on /dev/${_disk}${part_order[1]}" + # Create BOOT partition + _info "Creating boot partition (${boot_size})" printf "n\n${part_type}\n\n+${boot_size}\nw" | fdisk /dev/${_disk} partprobe /dev/${_disk} && sleep 1s yes | _check mkfs.${boot_filesystem} /dev/${_disk}${part_order[1]} # Get SWAP partition size - until [[ ${swap_size} =~ ^[0-9]{1,3}(M|G){1} \ - || ${swap_size,,} == "y" ]]; do - _note "Partition size {M,G} [default: 2G]" - _prompt "Swap partition size:" "default [y]" + until [[ ${swap_size} =~ ^[0-9]{1,3}(M|G){1}+$ ]]; do + _note "Partition size {M,G} (e.g., 2G)" + _prompt "Swap partition size:" read -r swap_size done - if [[ ${swap_size,,} == "y" ]]; then - swap_size="2G" - fi - # Create SWAP partition on /dev/xxx2 - _info "Setting Swap of ${swap_size} on /dev/${_disk}${part_order[2]}" + # Create SWAP partition + _info "Creating swap partition (${swap_size})" printf "n\n${part_type}\n\n+${swap_size}\nw" | fdisk /dev/${_disk} partprobe /dev/${_disk} && sleep 1s yes | _check mkswap /dev/${_disk}${part_order[2]} # Get SYSTEM partiton size - until [[ ${sys_size} =~ ^[0-9]{1,3}(G|T|P){1} \ - || ${sys_size,,} == "y" ]]; do - _note "Partition size {G,T,P} [default: 25G]" - _prompt "System partition size:" "default [y]" + until [[ ${sys_size} =~ ^[0-9]{1,3}(G|T|P){1}+$ ]]; do + _note "Partition size {G,T,P} (e.g., 25G)" + _prompt "System partition size:" read -r sys_size done - if [[ ${sys_size,,} == "y" ]]; then - sys_size="25G" - fi - # Create SYSTEM partition on /dev/xxx3 - _info "Setting System of ${sys_size} on /dev/${_disk}${part_order[3]}" + # Create SYSTEM partition + _info "Creating system partition (${sys_size})" printf "n\n${part_type}\n\n+${sys_size}\nw" | fdisk /dev/${_disk} partprobe /dev/${_disk} && sleep 1s yes | _check mkfs.ext4 /dev/${_disk}${part_order[3]} - # HOME partiton + # HOME partition if [[ ${FIRMWARE} == "UEFI" ]]; then - - # Get HOME partiton size - until [[ ${home_size} =~ ^[0-9]{1,3}(G|T|P){1} \ - || ${home_size,,} == "y" ]]; do - _note "Partition size {G,T,P} [default: free space]" - _prompt "Home partition size:" "default [y]" - read -r home_size - done - - # Define HOME partition size - if [[ ${home_size,,} == "y" ]]; then - part_size="free space" - home_size="" - else - part_size=${home_size} - home_size="+"${home_size} - fi - - # Create HOME partition on /dev/xxx4 - _info "Setting Home of ${part_size} on /dev/${_disk}${part_order[4]}" - printf "n\n\n\n${home_size}\nw" | fdisk /dev/${_disk} + _confirm "Do you wish to use free space for home?" + case ${confirm} in + y|Y|yes|Yes) + + # Create HOME partition + _info "Creating home partition (free space)" + printf "n\n${part_type}\n\nw" | fdisk /dev/${_disk} + ;; + *) + # Get HOME partiton size + until [[ ${home_size} =~ ^[0-9]{1,3}(G|T|P){1}+$ ]]; do + _note "Partition size {G,T,P} (e.g., 100G)" + _prompt "Home partition size:" + read -r home_size + done + + # Create HOME partition + _info "Creating home partition (${home_size})" + printf "n\n\n\n+${home_size}\nw" | fdisk /dev/${_disk} + ;; + esac else - _note "Home partition will use all free space" - _info "Setting Home on /dev/${_disk}${part_order[4]}" + # Create HOME partition + _info "Creating home partition (free space)" printf "n\n${part_type}\n\nw" | fdisk /dev/${_disk} fi partprobe /dev/${_disk} && sleep 1s From 20387c53529159d47200afc0fc3f48545a1e9da2 Mon Sep 17 00:00:00 2001 From: grm34 Date: Fri, 27 Mar 2020 21:20:34 +0100 Subject: [PATCH 15/37] Update confirm function --- archboot | 12 ++++++------ src/arch/partition | 4 ++-- src/arch/user | 6 +++--- src/arch/vga | 2 +- 4 files changed, 12 insertions(+), 12 deletions(-) diff --git a/archboot b/archboot index b758cef9..b92f535a 100644 --- a/archboot +++ b/archboot @@ -150,7 +150,7 @@ _select() { # Ask confirmation (Yes/No) _confirm() { count=$((${#1} + 6)) - until [[ ${confirm} =~ ^(y|n|Y|N)$ ]]; do + until [[ ${confirm} =~ ^(y|n|Y|N|yes|no|Yes|No|YES|NO)$ ]]; do echo -ne "${yellow}\n==> ${green}${1} ${red}[y/n]${yellow}\n==> " _end read -r confirm @@ -199,7 +199,7 @@ fi # Download base sources _confirm "Start downloading sources from github?" case ${confirm} in - y|Y) + y|Y|yes|Yes|YES) _info "Downloading base sources" _wget ${_url}/src/arch/base # to install Base system _wget ${_url}/src/arch/bootloader # to install Grub2 bootloader @@ -247,7 +247,7 @@ if [[ ! -z ${desktop+x} ]]; then _note "enter NO to activate kernel mode setting" _confirm "Do you wish to install VGA Driver?" case ${confirm} in - y|Y) + y|Y|yes|Yes|YES) # Get VGA Controller _get_vga_controller modsetting="true" @@ -271,7 +271,7 @@ _firmware; _mirrorlist; _timezone; _clock; _logs _note "enter NO to activate custom partitioning" _confirm "Do you wish to install Arch Linux on a dedicated disk?" case ${confirm} in - y|Y) + y|Y|yes|Yes|YES) _default_partitioning ;; *) @@ -298,7 +298,7 @@ _note "system is ready to rumble! Partitions mounted & swap activated!" _confirm "Do you wish to install Arch Linux now?" case ${confirm} in - y|Y) + y|Y|yes|Yes|YES) # Install Arch Linux base system (_install_base; _install_bootloader) 2>&1 | tee -a ${log} @@ -345,7 +345,7 @@ unset confirm _note "${__appname__} ${__version__} by ${__author__} under ${__license__}" _confirm "Do you want to reboot your computer now?" case ${confirm} in - y|Y) + y|Y|yes|Yes|YES) umount -R /mnt _reboot ;; diff --git a/src/arch/partition b/src/arch/partition index f34abd97..d8e9e5dc 100644 --- a/src/arch/partition +++ b/src/arch/partition @@ -43,7 +43,7 @@ _default_partitioning() { _note "WARNING! This will erase the entire drive" _confirm "Setting ${part_table} partition table on /dev/${_disk}?" case ${confirm} in - y|Y|yes|Yes) + y|Y|yes|Yes|YES) wipefs -fa /dev/${_disk} printf ${part_code}"\nw" | fdisk /dev/${_disk} partprobe /dev/${_disk} @@ -97,7 +97,7 @@ _default_partitioning() { if [[ ${FIRMWARE} == "UEFI" ]]; then _confirm "Do you wish to use free space for home?" case ${confirm} in - y|Y|yes|Yes) + y|Y|yes|Yes|YES) # Create HOME partition _info "Creating home partition (free space)" diff --git a/src/arch/user b/src/arch/user index 40988eb8..44bbb3ca 100644 --- a/src/arch/user +++ b/src/arch/user @@ -80,13 +80,13 @@ _get_user_variables() { # User Rights _confirm "Give all rights to user ${USER_name}?" - case ${confirm} in y|Y) export power="yes";; esac + case ${confirm} in y|Y|yes|Yes|YES) export power="yes";; esac unset confirm # Linux Kernel _confirm "Do you wish to install custom Linux Kernel?" case ${confirm} in - y|Y) + y|Y|yes|Yes|YES) until [[ ${kern} =~ ^([1-9]|4)$ ]]; do _select "Default" "Hardened" "LTS" "ZEN" read -r kern @@ -103,7 +103,7 @@ _get_user_variables() { # Desktop Environment _confirm "Do you wish to install Desktop Environment?" - case ${confirm} in y|Y) + case ${confirm} in y|Y|yes|Yes|YES) until [[ ${desk} =~ ^([1-9]|10)$ ]]; do _select "Gnome" "KDE" "MATE" "Xfce" \ "LXDE" "LXQt" "Deepin" "Budgie" "Cinnamon" "Enlightenment" diff --git a/src/arch/vga b/src/arch/vga index 8afc9c21..b13a1f3a 100644 --- a/src/arch/vga +++ b/src/arch/vga @@ -19,7 +19,7 @@ _get_vga_controller() { _note "${nvidia_card##*: } detected!" _confirm "Use Nvidia proprietary drivers?" case ${confirm} in - y|Y) + y|Y|yes|Yes|YES) export vga_driver="nvidia" export openGL="openGL_nvidia" export hard_video="hard_video_nvidia" From 7b42fe57687782f7828b929233bae334685b0b3d Mon Sep 17 00:00:00 2001 From: grm34 Date: Fri, 27 Mar 2020 21:34:34 +0100 Subject: [PATCH 16/37] Partitioning scheme --- archboot | 4 ++-- src/arch/partition | 12 ++++++------ 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/archboot b/archboot index b92f535a..0352048a 100644 --- a/archboot +++ b/archboot @@ -272,10 +272,10 @@ _note "enter NO to activate custom partitioning" _confirm "Do you wish to install Arch Linux on a dedicated disk?" case ${confirm} in y|Y|yes|Yes|YES) - _default_partitioning + _default_partitioning_scheme ;; *) - _custom_partitioning + _custom_partitioning_scheme ;; esac unset confirm diff --git a/src/arch/partition b/src/arch/partition index d8e9e5dc..5276d14e 100644 --- a/src/arch/partition +++ b/src/arch/partition @@ -20,7 +20,7 @@ # https://wiki.archlinux.org/index.php/Partitioning # ============================================================================ -_default_partitioning() { +_default_partitioning_scheme() { _info "Listing disk and partitions" @@ -56,7 +56,7 @@ _default_partitioning() { # Get BOOT partition size until [[ ${boot_size} =~ ^[0-9]{1,3}(M|G){1}+$ ]]; do - _note "Partition size {M,G} (e.g., 512M)" + _note "partition size {M,G} (e.g., 512M)" _prompt "Boot partition size:" read -r boot_size done @@ -69,7 +69,7 @@ _default_partitioning() { # Get SWAP partition size until [[ ${swap_size} =~ ^[0-9]{1,3}(M|G){1}+$ ]]; do - _note "Partition size {M,G} (e.g., 2G)" + _note "partition size {M,G} (e.g., 2G)" _prompt "Swap partition size:" read -r swap_size done @@ -82,7 +82,7 @@ _default_partitioning() { # Get SYSTEM partiton size until [[ ${sys_size} =~ ^[0-9]{1,3}(G|T|P){1}+$ ]]; do - _note "Partition size {G,T,P} (e.g., 25G)" + _note "partition size {G,T,P} (e.g., 25G)" _prompt "System partition size:" read -r sys_size done @@ -106,7 +106,7 @@ _default_partitioning() { *) # Get HOME partiton size until [[ ${home_size} =~ ^[0-9]{1,3}(G|T|P){1}+$ ]]; do - _note "Partition size {G,T,P} (e.g., 100G)" + _note "partition size {G,T,P} (e.g., 100G)" _prompt "Home partition size:" read -r home_size done @@ -132,7 +132,7 @@ _default_partitioning() { export _home="/dev/${_disk}${part_order[4]}" } -_custom_partitioning() { +_custom_partitioning_scheme() { _info "Listing disk and partitions" From 0f791faf4b7f960a2a45667259e516d08cca2722 Mon Sep 17 00:00:00 2001 From: grm34 Date: Fri, 27 Mar 2020 21:58:10 +0100 Subject: [PATCH 17/37] Update README.md --- README.md | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/README.md b/README.md index d4ba0078..2f45a15f 100644 --- a/README.md +++ b/README.md @@ -14,17 +14,17 @@ and in order to get complete support, additional packages may be required. The only thing you need is one **USB bootable device** of [Arch Linux](https://mir.archlinux.fr/iso/latest) -* *USB Boot instruction for* [Windows](https://rufus.ie/) *or* [Linux](https://wiki.archlinux.org/index.php/USB_flash_installation_media) +> USB Boot instruction for [Windows](https://rufus.ie/) or [Linux](https://wiki.archlinux.org/index.php/USB_flash_installation_media) ## Usage -**1.** Reboot computer, open Boot Selection Menu and boot on the USB device +> **1.** Reboot computer, open Boot Selection Menu and boot on the USB device -**2.** On the install menu of Arch Linux, select Boot Arch Linux (x86_64) +> **2.** On the install menu of Arch Linux, select Boot Arch Linux (x86_64) -**3.** For AZERTY keyboard run: *`loqdkeys fr`* +> **3.** For AZERTY keyboard run: *`loqdkeys fr`* -**4.** Download and run archboot: *`wget tiny.cc/archboot-dev; sh archboot-dev`* +> **4.** Download and run archboot: *`wget tiny.cc/archboot-dev; sh archboot-dev`* ## Wiki @@ -39,7 +39,7 @@ The only thing you need is one **USB bootable device** of [Arch Linux](https://m ## Logs -Take a look at **/var/log/archboot**: *`cat /var/log/archboot/archboot*.log`* +> Take a look at **/var/log/archboot**: *`cat /var/log/archboot/archboot*.log`* ## Screenshot From 5b808a93dba6dfa9fa15b81af0cc48e13ddab889 Mon Sep 17 00:00:00 2001 From: grm34 Date: Fri, 27 Mar 2020 22:13:08 +0100 Subject: [PATCH 18/37] Update README.md --- README.md | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/README.md b/README.md index 2f45a15f..bd9a0228 100644 --- a/README.md +++ b/README.md @@ -18,13 +18,13 @@ The only thing you need is one **USB bootable device** of [Arch Linux](https://m ## Usage -> **1.** Reboot computer, open Boot Selection Menu and boot on the USB device +**1.** Reboot computer, open Boot Selection Menu and boot on the USB device -> **2.** On the install menu of Arch Linux, select Boot Arch Linux (x86_64) +**2.** On the install menu of Arch Linux, select Boot Arch Linux (x86_64) -> **3.** For AZERTY keyboard run: *`loqdkeys fr`* +> For AZERTY keyboard run: *`loqdkeys fr`* -> **4.** Download and run archboot: *`wget tiny.cc/archboot-dev; sh archboot-dev`* +**3.** Download and run archboot: *`wget tiny.cc/archboot-dev; sh archboot-dev`* ## Wiki From 6376196a3d22045b451232a17a13921dd4e31dd6 Mon Sep 17 00:00:00 2001 From: grm34 Date: Fri, 27 Mar 2020 22:16:41 +0100 Subject: [PATCH 19/37] Update README.md --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index bd9a0228..415479b8 100644 --- a/README.md +++ b/README.md @@ -39,7 +39,7 @@ The only thing you need is one **USB bootable device** of [Arch Linux](https://m ## Logs -> Take a look at **/var/log/archboot**: *`cat /var/log/archboot/archboot*.log`* +Take a look at **/var/log/archboot**: *`cat /var/log/archboot/archboot*.log`* ## Screenshot From 79884dbec88edc9b2123788cd30a2aad9087304c Mon Sep 17 00:00:00 2001 From: grm34 Date: Fri, 27 Mar 2020 22:24:49 +0100 Subject: [PATCH 20/37] Update shields --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 415479b8..0849a24c 100644 --- a/README.md +++ b/README.md @@ -1,6 +1,6 @@ # [![archboot](https://www.archboot.org/assets/images/logo.png)](https://www.archboot.org) -[![version](https://img.shields.io/badge/version-v2.8.5-blue.svg)](https://github.com/grm34/archboot/releases)[![Build Status](https://travis-ci.org/grm34/archboot.svg?branch=master)](https://travis-ci.org/grm34/archboot)[![author](https://img.shields.io/badge/author-grm34-red.svg)](https://github.com/grm34)[![license](https://img.shields.io/badge/license-Apache%202.0-blue.svg)](https://github.com/grm34/archboot/blob/master/LICENSE)[![telegram](https://img.shields.io/badge/Telegram-chat-red)](https://t.me/archboot)[![maintenance](https://img.shields.io/maintenance/yes/2020.svg)](https://github.com/grm34/archboot/pulse) +[![version](https://img.shields.io/badge/version-v2.8.5-blue.svg?style=flat-square&logo=appveyor)](https://github.com/grm34/archboot/releases)[![author](https://img.shields.io/badge/author-grm34-red.svg?style=flat-square&logo=appveyor)](https://github.com/grm34)[![license](https://img.shields.io/badge/license-Apache%202.0-blue.svg?style=flat-square&logo=appveyor)](https://github.com/grm34/archboot/blob/master/LICENSE)[![telegram](https://img.shields.io/badge/Telegram-chat-red?style=flat-square&logo=appveyor)](https://t.me/archboot)[![maintenance](https://img.shields.io/maintenance/yes/2020.svg?style=flat-square&logo=appveyor)](https://github.com/grm34/archboot/pulse) Arch Linux is a light and fast distribution whose concept is to remain as simple as possible. In the same purpose, this script performs minimalist From ac2fceb5a2f947957f155abb20414e278bd970e4 Mon Sep 17 00:00:00 2001 From: grm34 Date: Fri, 27 Mar 2020 22:25:48 +0100 Subject: [PATCH 21/37] Remove TravisCI --- .travis.yml | 1 - 1 file changed, 1 deletion(-) delete mode 100644 .travis.yml diff --git a/.travis.yml b/.travis.yml deleted file mode 100644 index d79b42d9..00000000 --- a/.travis.yml +++ /dev/null @@ -1 +0,0 @@ -language: generic From cf855ea7ae91af1be71952cc57351bebe32f6d03 Mon Sep 17 00:00:00 2001 From: grm34 Date: Fri, 27 Mar 2020 22:27:38 +0100 Subject: [PATCH 22/37] Update shields --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 0849a24c..924c5ace 100644 --- a/README.md +++ b/README.md @@ -1,6 +1,6 @@ # [![archboot](https://www.archboot.org/assets/images/logo.png)](https://www.archboot.org) -[![version](https://img.shields.io/badge/version-v2.8.5-blue.svg?style=flat-square&logo=appveyor)](https://github.com/grm34/archboot/releases)[![author](https://img.shields.io/badge/author-grm34-red.svg?style=flat-square&logo=appveyor)](https://github.com/grm34)[![license](https://img.shields.io/badge/license-Apache%202.0-blue.svg?style=flat-square&logo=appveyor)](https://github.com/grm34/archboot/blob/master/LICENSE)[![telegram](https://img.shields.io/badge/Telegram-chat-red?style=flat-square&logo=appveyor)](https://t.me/archboot)[![maintenance](https://img.shields.io/maintenance/yes/2020.svg?style=flat-square&logo=appveyor)](https://github.com/grm34/archboot/pulse) +[![version](https://img.shields.io/badge/version-v2.8.5-blue.svg?style=flat-square&logo=appveyor)](https://github.com/grm34/archboot/releases) [![author](https://img.shields.io/badge/author-grm34-red.svg?style=flat-square&logo=appveyor)](https://github.com/grm34) [![license](https://img.shields.io/badge/license-Apache%202.0-blue.svg?style=flat-square&logo=appveyor)](https://github.com/grm34/archboot/blob/master/LICENSE) [![telegram](https://img.shields.io/badge/Telegram-chat-red?style=flat-square&logo=appveyor)](https://t.me/archboot) [![maintenance](https://img.shields.io/maintenance/yes/2020.svg?style=flat-square&logo=appveyor)](https://github.com/grm34/archboot/pulse) Arch Linux is a light and fast distribution whose concept is to remain as simple as possible. In the same purpose, this script performs minimalist From c3a0ad5c08a02a7c99d76b4169caad2173d38273 Mon Sep 17 00:00:00 2001 From: grm34 Date: Fri, 27 Mar 2020 22:31:19 +0100 Subject: [PATCH 23/37] Update Shields to flat --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 924c5ace..21940952 100644 --- a/README.md +++ b/README.md @@ -1,6 +1,6 @@ # [![archboot](https://www.archboot.org/assets/images/logo.png)](https://www.archboot.org) -[![version](https://img.shields.io/badge/version-v2.8.5-blue.svg?style=flat-square&logo=appveyor)](https://github.com/grm34/archboot/releases) [![author](https://img.shields.io/badge/author-grm34-red.svg?style=flat-square&logo=appveyor)](https://github.com/grm34) [![license](https://img.shields.io/badge/license-Apache%202.0-blue.svg?style=flat-square&logo=appveyor)](https://github.com/grm34/archboot/blob/master/LICENSE) [![telegram](https://img.shields.io/badge/Telegram-chat-red?style=flat-square&logo=appveyor)](https://t.me/archboot) [![maintenance](https://img.shields.io/maintenance/yes/2020.svg?style=flat-square&logo=appveyor)](https://github.com/grm34/archboot/pulse) +[![version](https://img.shields.io/badge/version-v2.8.5-blue.svg?style=flat&logo=appveyor)](https://github.com/grm34/archboot/releases) [![author](https://img.shields.io/badge/author-grm34-red.svg?style=flat&logo=appveyor)](https://github.com/grm34) [![license](https://img.shields.io/badge/license-Apache%202.0-blue.svg?style=flat&logo=appveyor)](https://github.com/grm34/archboot/blob/master/LICENSE) [![telegram](https://img.shields.io/badge/Telegram-chat-red?style=flat&logo=appveyor)](https://t.me/archboot) [![maintenance](https://img.shields.io/maintenance/yes/2020.svg?style=flat&logo=appveyor)](https://github.com/grm34/archboot/pulse) Arch Linux is a light and fast distribution whose concept is to remain as simple as possible. In the same purpose, this script performs minimalist From 6397119198d79adc591b3add7f4ca5a5dfd59704 Mon Sep 17 00:00:00 2001 From: grm34 Date: Fri, 27 Mar 2020 22:32:45 +0100 Subject: [PATCH 24/37] Switch Shields to plastic --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 21940952..dfa4136d 100644 --- a/README.md +++ b/README.md @@ -1,6 +1,6 @@ # [![archboot](https://www.archboot.org/assets/images/logo.png)](https://www.archboot.org) -[![version](https://img.shields.io/badge/version-v2.8.5-blue.svg?style=flat&logo=appveyor)](https://github.com/grm34/archboot/releases) [![author](https://img.shields.io/badge/author-grm34-red.svg?style=flat&logo=appveyor)](https://github.com/grm34) [![license](https://img.shields.io/badge/license-Apache%202.0-blue.svg?style=flat&logo=appveyor)](https://github.com/grm34/archboot/blob/master/LICENSE) [![telegram](https://img.shields.io/badge/Telegram-chat-red?style=flat&logo=appveyor)](https://t.me/archboot) [![maintenance](https://img.shields.io/maintenance/yes/2020.svg?style=flat&logo=appveyor)](https://github.com/grm34/archboot/pulse) +[![version](https://img.shields.io/badge/version-v2.8.5-blue.svg?style=plastic&logo=appveyor)](https://github.com/grm34/archboot/releases) [![author](https://img.shields.io/badge/author-grm34-red.svg?style=plastic&logo=appveyor)](https://github.com/grm34) [![license](https://img.shields.io/badge/license-Apache%202.0-blue.svg?style=plastic&logo=appveyor)](https://github.com/grm34/archboot/blob/master/LICENSE) [![telegram](https://img.shields.io/badge/Telegram-chat-red?style=plastic&logo=appveyor)](https://t.me/archboot) [![maintenance](https://img.shields.io/maintenance/yes/2020.svg?style=plastic&logo=appveyor)](https://github.com/grm34/archboot/pulse) Arch Linux is a light and fast distribution whose concept is to remain as simple as possible. In the same purpose, this script performs minimalist From 737405e12de1f53434efd277b33c3c1e17c59936 Mon Sep 17 00:00:00 2001 From: grm34 Date: Fri, 27 Mar 2020 22:35:02 +0100 Subject: [PATCH 25/37] Update README.md --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index dfa4136d..21940952 100644 --- a/README.md +++ b/README.md @@ -1,6 +1,6 @@ # [![archboot](https://www.archboot.org/assets/images/logo.png)](https://www.archboot.org) -[![version](https://img.shields.io/badge/version-v2.8.5-blue.svg?style=plastic&logo=appveyor)](https://github.com/grm34/archboot/releases) [![author](https://img.shields.io/badge/author-grm34-red.svg?style=plastic&logo=appveyor)](https://github.com/grm34) [![license](https://img.shields.io/badge/license-Apache%202.0-blue.svg?style=plastic&logo=appveyor)](https://github.com/grm34/archboot/blob/master/LICENSE) [![telegram](https://img.shields.io/badge/Telegram-chat-red?style=plastic&logo=appveyor)](https://t.me/archboot) [![maintenance](https://img.shields.io/maintenance/yes/2020.svg?style=plastic&logo=appveyor)](https://github.com/grm34/archboot/pulse) +[![version](https://img.shields.io/badge/version-v2.8.5-blue.svg?style=flat&logo=appveyor)](https://github.com/grm34/archboot/releases) [![author](https://img.shields.io/badge/author-grm34-red.svg?style=flat&logo=appveyor)](https://github.com/grm34) [![license](https://img.shields.io/badge/license-Apache%202.0-blue.svg?style=flat&logo=appveyor)](https://github.com/grm34/archboot/blob/master/LICENSE) [![telegram](https://img.shields.io/badge/Telegram-chat-red?style=flat&logo=appveyor)](https://t.me/archboot) [![maintenance](https://img.shields.io/maintenance/yes/2020.svg?style=flat&logo=appveyor)](https://github.com/grm34/archboot/pulse) Arch Linux is a light and fast distribution whose concept is to remain as simple as possible. In the same purpose, this script performs minimalist From 757c0ff2caf2791e95eb2a653c7716bd12e1ed72 Mon Sep 17 00:00:00 2001 From: grm34 Date: Fri, 27 Mar 2020 22:42:42 +0100 Subject: [PATCH 26/37] Update README.md --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 21940952..624e1faf 100644 --- a/README.md +++ b/README.md @@ -14,7 +14,7 @@ and in order to get complete support, additional packages may be required. The only thing you need is one **USB bootable device** of [Arch Linux](https://mir.archlinux.fr/iso/latest) -> USB Boot instruction for [Windows](https://rufus.ie/) or [Linux](https://wiki.archlinux.org/index.php/USB_flash_installation_media) +> [USB flash installation media](https://wiki.archlinux.org/index.php/USB_flash_installation_media) ## Usage From 2d94d4207977f8c27cb4025c2e344cafcc70f072 Mon Sep 17 00:00:00 2001 From: grm34 Date: Fri, 27 Mar 2020 22:49:50 +0100 Subject: [PATCH 27/37] Update README.md --- README.md | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/README.md b/README.md index 624e1faf..0002ac38 100644 --- a/README.md +++ b/README.md @@ -14,8 +14,6 @@ and in order to get complete support, additional packages may be required. The only thing you need is one **USB bootable device** of [Arch Linux](https://mir.archlinux.fr/iso/latest) -> [USB flash installation media](https://wiki.archlinux.org/index.php/USB_flash_installation_media) - ## Usage **1.** Reboot computer, open Boot Selection Menu and boot on the USB device @@ -48,6 +46,7 @@ Take a look at **/var/log/archboot**: *`cat /var/log/archboot/archboot*.log`* ## Official Documentation * [Arch Linux Installation Guide](https://wiki.archlinux.org/index.php/Installation_guide) +* [USB flash installation media](https://wiki.archlinux.org/index.php/USB_flash_installation_media) * [File System](https://wiki.archlinux.org/index.php/file_systems) *(may be required if not included in DE)* * [Multimedia](https://wiki.archlinux.org/index.php/List_of_applications/Multimedia) *(may be required if not included in DE)* * [Cups](https://wiki.archlinux.org/index.php/CUPS) *(may be required if not included in DE)* From 299b30cbcf5a88d977d2290a81c978c257832444 Mon Sep 17 00:00:00 2001 From: grm34 Date: Fri, 27 Mar 2020 23:18:55 +0100 Subject: [PATCH 28/37] Update partitioning comments --- src/arch/partition | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/arch/partition b/src/arch/partition index 5276d14e..1344f47d 100644 --- a/src/arch/partition +++ b/src/arch/partition @@ -9,7 +9,7 @@ # # SYSTEM......: /mnt # BOOT........: /mnt/boot -# SWAP........: no mount point +# SWAP........: no mountpoint # HOME........: /mnt/home # # We use partprobe to inform system changes and From cc8fec72620ba287ec7d0d3e8e3f9154e2481dd0 Mon Sep 17 00:00:00 2001 From: grm34 Date: Fri, 27 Mar 2020 23:22:04 +0100 Subject: [PATCH 29/37] Update README.md --- README.md | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/README.md b/README.md index 0002ac38..202c8eae 100644 --- a/README.md +++ b/README.md @@ -1,6 +1,4 @@ -# [![archboot](https://www.archboot.org/assets/images/logo.png)](https://www.archboot.org) - -[![version](https://img.shields.io/badge/version-v2.8.5-blue.svg?style=flat&logo=appveyor)](https://github.com/grm34/archboot/releases) [![author](https://img.shields.io/badge/author-grm34-red.svg?style=flat&logo=appveyor)](https://github.com/grm34) [![license](https://img.shields.io/badge/license-Apache%202.0-blue.svg?style=flat&logo=appveyor)](https://github.com/grm34/archboot/blob/master/LICENSE) [![telegram](https://img.shields.io/badge/Telegram-chat-red?style=flat&logo=appveyor)](https://t.me/archboot) [![maintenance](https://img.shields.io/maintenance/yes/2020.svg?style=flat&logo=appveyor)](https://github.com/grm34/archboot/pulse) +# [![archboot](https://www.archboot.org/assets/images/logo.png)](https://www.archboot.org)[![version](https://img.shields.io/badge/version-v2.8.5-blue.svg?style=flat&logo=appveyor)](https://github.com/grm34/archboot/releases) [![author](https://img.shields.io/badge/author-grm34-red.svg?style=flat&logo=appveyor)](https://github.com/grm34) [![license](https://img.shields.io/badge/license-Apache%202.0-blue.svg?style=flat&logo=appveyor)](https://github.com/grm34/archboot/blob/master/LICENSE) [![telegram](https://img.shields.io/badge/Telegram-chat-red?style=flat&logo=appveyor)](https://t.me/archboot) [![maintenance](https://img.shields.io/maintenance/yes/2020.svg?style=flat&logo=appveyor)](https://github.com/grm34/archboot/pulse) Arch Linux is a light and fast distribution whose concept is to remain as simple as possible. In the same purpose, this script performs minimalist From c524a1158d6aaf32fdadfab953ff9eb43c832150 Mon Sep 17 00:00:00 2001 From: grm34 Date: Fri, 27 Mar 2020 23:22:57 +0100 Subject: [PATCH 30/37] Update README.md --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 202c8eae..1653e5e0 100644 --- a/README.md +++ b/README.md @@ -1,4 +1,4 @@ -# [![archboot](https://www.archboot.org/assets/images/logo.png)](https://www.archboot.org)[![version](https://img.shields.io/badge/version-v2.8.5-blue.svg?style=flat&logo=appveyor)](https://github.com/grm34/archboot/releases) [![author](https://img.shields.io/badge/author-grm34-red.svg?style=flat&logo=appveyor)](https://github.com/grm34) [![license](https://img.shields.io/badge/license-Apache%202.0-blue.svg?style=flat&logo=appveyor)](https://github.com/grm34/archboot/blob/master/LICENSE) [![telegram](https://img.shields.io/badge/Telegram-chat-red?style=flat&logo=appveyor)](https://t.me/archboot) [![maintenance](https://img.shields.io/maintenance/yes/2020.svg?style=flat&logo=appveyor)](https://github.com/grm34/archboot/pulse) +# [![archboot](https://www.archboot.org/assets/images/logo.png)](https://www.archboot.org) [![version](https://img.shields.io/badge/version-v2.8.5-blue.svg?style=flat&logo=appveyor)](https://github.com/grm34/archboot/releases) [![author](https://img.shields.io/badge/author-grm34-red.svg?style=flat&logo=appveyor)](https://github.com/grm34) [![license](https://img.shields.io/badge/license-Apache%202.0-blue.svg?style=flat&logo=appveyor)](https://github.com/grm34/archboot/blob/master/LICENSE) [![telegram](https://img.shields.io/badge/Telegram-chat-red?style=flat&logo=appveyor)](https://t.me/archboot) [![maintenance](https://img.shields.io/maintenance/yes/2020.svg?style=flat&logo=appveyor)](https://github.com/grm34/archboot/pulse) Arch Linux is a light and fast distribution whose concept is to remain as simple as possible. In the same purpose, this script performs minimalist From 0120066187939ebbbd179aea2b4f92829f74bf03 Mon Sep 17 00:00:00 2001 From: grm34 Date: Fri, 27 Mar 2020 23:28:58 +0100 Subject: [PATCH 31/37] Update README.md --- README.md | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/README.md b/README.md index 1653e5e0..bdbf7a93 100644 --- a/README.md +++ b/README.md @@ -1,4 +1,7 @@ -# [![archboot](https://www.archboot.org/assets/images/logo.png)](https://www.archboot.org) [![version](https://img.shields.io/badge/version-v2.8.5-blue.svg?style=flat&logo=appveyor)](https://github.com/grm34/archboot/releases) [![author](https://img.shields.io/badge/author-grm34-red.svg?style=flat&logo=appveyor)](https://github.com/grm34) [![license](https://img.shields.io/badge/license-Apache%202.0-blue.svg?style=flat&logo=appveyor)](https://github.com/grm34/archboot/blob/master/LICENSE) [![telegram](https://img.shields.io/badge/Telegram-chat-red?style=flat&logo=appveyor)](https://t.me/archboot) [![maintenance](https://img.shields.io/maintenance/yes/2020.svg?style=flat&logo=appveyor)](https://github.com/grm34/archboot/pulse) + +# [![archboot](https://www.archboot.org/assets/images/logo.png)](https://www.archboot.org) + +[![version](https://img.shields.io/badge/version-v2.8.5-blue.svg?style=flat&logo=appveyor)](https://github.com/grm34/archboot/releases) [![author](https://img.shields.io/badge/author-grm34-red.svg?style=flat&logo=appveyor)](https://github.com/grm34) [![license](https://img.shields.io/badge/license-Apache%202.0-blue.svg?style=flat&logo=appveyor)](https://github.com/grm34/archboot/blob/master/LICENSE) [![telegram](https://img.shields.io/badge/Telegram-chat-red?style=flat&logo=appveyor)](https://t.me/archboot) [![maintenance](https://img.shields.io/maintenance/yes/2020.svg?style=flat&logo=appveyor)](https://github.com/grm34/archboot/pulse) Arch Linux is a light and fast distribution whose concept is to remain as simple as possible. In the same purpose, this script performs minimalist From ad57d5fddbf826d5e22093ac561ee0d8914899c0 Mon Sep 17 00:00:00 2001 From: grm34 Date: Sat, 28 Mar 2020 00:05:08 +0100 Subject: [PATCH 32/37] Update README.md --- .gitignore | 1 + README.md | 3 +-- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.gitignore b/.gitignore index 7188dc3f..a0d6773c 100644 --- a/.gitignore +++ b/.gitignore @@ -4,3 +4,4 @@ !.vscode/tasks.json !.vscode/launch.json !.vscode/extensions.json +.markdownlint.json diff --git a/README.md b/README.md index bdbf7a93..df99f0c3 100644 --- a/README.md +++ b/README.md @@ -1,5 +1,4 @@ - -# [![archboot](https://www.archboot.org/assets/images/logo.png)](https://www.archboot.org) +[![archboot](https://www.archboot.org/assets/images/logo.png)](https://www.archboot.org) [![version](https://img.shields.io/badge/version-v2.8.5-blue.svg?style=flat&logo=appveyor)](https://github.com/grm34/archboot/releases) [![author](https://img.shields.io/badge/author-grm34-red.svg?style=flat&logo=appveyor)](https://github.com/grm34) [![license](https://img.shields.io/badge/license-Apache%202.0-blue.svg?style=flat&logo=appveyor)](https://github.com/grm34/archboot/blob/master/LICENSE) [![telegram](https://img.shields.io/badge/Telegram-chat-red?style=flat&logo=appveyor)](https://t.me/archboot) [![maintenance](https://img.shields.io/maintenance/yes/2020.svg?style=flat&logo=appveyor)](https://github.com/grm34/archboot/pulse) From 8b7b3caaf31936246925c86c81f652dc084ba9fe Mon Sep 17 00:00:00 2001 From: grm34 Date: Sat, 28 Mar 2020 00:12:24 +0100 Subject: [PATCH 33/37] Update gitignore --- .gitignore | 1 - 1 file changed, 1 deletion(-) diff --git a/.gitignore b/.gitignore index a0d6773c..7188dc3f 100644 --- a/.gitignore +++ b/.gitignore @@ -4,4 +4,3 @@ !.vscode/tasks.json !.vscode/launch.json !.vscode/extensions.json -.markdownlint.json From 3726b164594b6eef9595b6974c8a0a051ffc37a2 Mon Sep 17 00:00:00 2001 From: grm34 Date: Sat, 28 Mar 2020 00:14:57 +0100 Subject: [PATCH 34/37] markdown rules --- .markdownlint.json | 4 ++++ 1 file changed, 4 insertions(+) create mode 100644 .markdownlint.json diff --git a/.markdownlint.json b/.markdownlint.json new file mode 100644 index 00000000..aefe733f --- /dev/null +++ b/.markdownlint.json @@ -0,0 +1,4 @@ +{ + "MD041": false, + "MD013": false +} From ed6268677407aaa9240e0e465f0967067ac2c11b Mon Sep 17 00:00:00 2001 From: grm34 Date: Sat, 28 Mar 2020 00:40:03 +0100 Subject: [PATCH 35/37] Update shields cache --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index df99f0c3..6b5fd9ff 100644 --- a/README.md +++ b/README.md @@ -1,6 +1,6 @@ [![archboot](https://www.archboot.org/assets/images/logo.png)](https://www.archboot.org) -[![version](https://img.shields.io/badge/version-v2.8.5-blue.svg?style=flat&logo=appveyor)](https://github.com/grm34/archboot/releases) [![author](https://img.shields.io/badge/author-grm34-red.svg?style=flat&logo=appveyor)](https://github.com/grm34) [![license](https://img.shields.io/badge/license-Apache%202.0-blue.svg?style=flat&logo=appveyor)](https://github.com/grm34/archboot/blob/master/LICENSE) [![telegram](https://img.shields.io/badge/Telegram-chat-red?style=flat&logo=appveyor)](https://t.me/archboot) [![maintenance](https://img.shields.io/maintenance/yes/2020.svg?style=flat&logo=appveyor)](https://github.com/grm34/archboot/pulse) +[![version](https://img.shields.io/badge/version-v2.8.5-blue.svg?style=flat&logo=github&?cacheSeconds=3600)](https://github.com/grm34/archboot/releases) [![maintenance](https://img.shields.io/maintenance/yes/2020.svg?&style=flat&logo=github&cacheSeconds=3600)](https://github.com/grm34/archboot/pulse) [![author](https://img.shields.io/badge/author-grm34-red.svg?&style=flat&logo=github&?cacheSeconds=3600)](https://github.com/grm34) [![license](https://img.shields.io/badge/license-Apache%202.0-blue.svg?style=flat&logo=github&?cacheSeconds=3600)](https://github.com/grm34/archboot/blob/master/LICENSE) [![telegram](https://img.shields.io/badge/Telegram-chat-red?style=flat&logo=telegram&cacheSeconds=3600)](https://t.me/archboot) Arch Linux is a light and fast distribution whose concept is to remain as simple as possible. In the same purpose, this script performs minimalist From 14a80135f85bbdd009e415b90ad07c500a5ed75f Mon Sep 17 00:00:00 2001 From: grm34 Date: Sat, 28 Mar 2020 08:22:38 +0100 Subject: [PATCH 36/37] Update base system --- src/arch/base | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/arch/base b/src/arch/base index 9299307b..d5540940 100644 --- a/src/arch/base +++ b/src/arch/base @@ -22,18 +22,18 @@ _install_base() { cat /mnt/etc/fstab # TimeZone - _info "Setting ${timezone} timezone" + _info "Setting timezone to ${timezone}" ln -sf /usr/share/zoneinfo/${timezone} /mnt/etc/localtime # locale - _info "Setting ${language}.UTF-8 locale" + _info "Setting locale to ${language}.UTF-8" echo "${language}.UTF-8 UTF-8" >> /mnt/etc/locale.gen _chroot "locale-gen export LANG=${language}.UTF-8" echo "LANG=${language}.UTF-8" > /mnt/etc/locale.conf # vconsole - _info "Setting ${keymap_code} virtual console" + _info "Setting virtual console to ${keymap_code^^}" echo "KEYMAP=${keymap_code}" > /mnt/etc/vconsole.conf # hostname From 0addcc36d910aee59d726496bb70d9aa50709036 Mon Sep 17 00:00:00 2001 From: grm34 Date: Sat, 28 Mar 2020 08:25:31 +0100 Subject: [PATCH 37/37] Update configure_desktop_environment --- src/arch/desktop | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/arch/desktop b/src/arch/desktop index b1c42da2..b8d6f7f8 100644 --- a/src/arch/desktop +++ b/src/arch/desktop @@ -38,7 +38,7 @@ _install_desktop_environment() { _configure_desktop_environment() { # Keyboard layout - _info "Setting ${keymap_code} keyboard layout" + _info "Setting keyboard layout to ${keymap_code^^}" wget ${_url}/conf/00-keyboard.conf sed -i -e "s/keymap_code/${keymap_code}/g" 00-keyboard.conf mv 00-keyboard.conf /mnt/etc/X11/xorg.conf.d/