Merge pull request #48 from grm34:dev

Remove Bumblebee | kernel mode setting | New partitioning scheme
grm34 · Mar 28, 2020 · 3cc79ff · 3cc79ff
2 parents 438cfdf + 0addcc3
commit 3cc79ff
Show file tree

Hide file tree

Showing 18 changed files with 217 additions and 251 deletions.
diff --git a/.markdownlint.json b/.markdownlint.json
@@ -1,5 +1,4 @@
 {
-    "MD013": false,
-    "MD033": false,
-    "MD041": false
+    "MD041": false,
+    "MD013": false
 }
diff --git a/.travis.yml b/.travis.yml
diff --git a/README.md b/README.md
@@ -1,26 +1,28 @@
-<a href="https://grm34.github.io/archboot/">
-  <img src="https://raw.githubusercontent.com/grm34/archboot/gh-pages/assets/images/logo.png">
-</a>
+[![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&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 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
 
 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)
-
 ## 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`
+> For AZERTY keyboard run: *`loqdkeys fr`*
 
-**4.** Download and follow the instructions `wget tiny.cc/archboot; sh archboot`
+**3.** Download and run archboot: *`wget tiny.cc/archboot-dev; sh archboot-dev`*
 
 ## Wiki
 
@@ -35,24 +37,21 @@ 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
 
-<a href="https://raw.githubusercontent.com/grm34/archboot/gh-pages/assets/images/screenshot.png">
-  <img src="https://raw.githubusercontent.com/grm34/archboot/gh-pages/assets/images/screenshot.png">
-</a>
+[![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
-* [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)
+* [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)*
+* [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)

diff --git a/archboot b/archboot
@@ -1,9 +1,9 @@
 #!/bin/bash
 __appname__="archboot"
 __version__="v2.8.5"
-__branch__="master"
-__author__="@grm34"
-__license__="Apache v2.0 License"
+__branch__="dev"
+__author__="grm34"
+__license__="Apache License 2.0"
 
 _archboot_banner() {
     echo -e """${red}
@@ -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,11 +24,11 @@ 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
 """
 }
 
-#                      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.
@@ -37,9 +37,11 @@ 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
-_url="https://raw.githubusercontent.com/grm34/archboot/${__branch__}"
-_gh_pages="https://raw.githubusercontent.com/grm34/archboot/gh-pages"
+# Github url for sources and images
+_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"
@@ -56,7 +58,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
 }
@@ -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"
 }
@@ -93,9 +95,9 @@ _check() {
     return ${status}
 }
 
-# Cleanup: delete sources - umount partitions - exit
+# 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
 }
 
@@ -148,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
@@ -164,50 +166,51 @@ _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 "-"
     done
     echo -ne "\n==> ${nc}"
 }
 
-#                        ARCHBOOT SYSTEM PROCESS
+#                      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]
 # 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.
+# 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
 _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
-        _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
         _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
@@ -220,10 +223,10 @@ _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]
-_ask_user_variables
+# Get required variables
+_get_user_variables
 
-# If Desktop Environment
+# Desktop Environment
 if [[ ! -z ${desktop+x} ]]; then
 
     # Download desktop sources
@@ -240,32 +243,49 @@ 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 kernel mode setting?
+    _note "enter NO to activate kernel mode setting"
+    _confirm "Do you wish to install VGA Driver?"
+    case ${confirm} in
+        y|Y|yes|Yes|YES)
+            # Get VGA Controller
+            _get_vga_controller
+            modsetting="true"
+            ;;
+    esac
+    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
-_note "WARNING! Enter NO only if partitions properly created and formated"
+# Partitioning
+_note "enter NO to activate custom partitioning"
 _confirm "Do you wish to install Arch Linux on a dedicated disk?"
 case ${confirm} in
-    y|Y)
-        _partition
+    y|Y|yes|Yes|YES)
+        _default_partitioning_scheme
         ;;
     *)
-        _custom_partition
+        _custom_partitioning_scheme
         ;;
 esac
 unset confirm
 
-# Mount partitions
+# Mount
 _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.
@@ -278,30 +298,34 @@ _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
-        (_base; _bootloader) 2>&1 | tee -a ${log}
+        (_install_base; _install_bootloader) 2>&1 | tee -a ${log}
+
+        # Install VGA Driver
+        if [[ ! -z ${modsetting+x} ]]; then
+            (_install_vga_driver) 2>&1 | tee -a ${log}
+        fi
 
-        # Install desktop environment
+        # 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
         _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 "installation successful! // \
-${__appname__} ${__version__} by ${__author__} under ${__license__}"
+        _note "Arch Linux installation successful!"
         ;;
 
     *)
@@ -311,16 +335,17 @@ ${__appname__} ${__version__} by ${__author__} under ${__license__}"
 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.
 # 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)
+    y|Y|yes|Yes|YES)
         umount -R /mnt
         _reboot
         ;;
@@ -329,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
@@ -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
 # ============================================================================