# This program is free software, provided under the GNU GPL
# Written by Nathaniel Maia for use in Archlabs
# Some ideas and code reworked from other resources
-# AIF, Cnichi, Calamares, Arch Wiki.. Credit where credit is due
+# AIF, Calamares, and the Arch Wiki.. Credit where credit is due
-VER=2.0.86
+# check for syntax errors
+# set -n
-# bulk default values {
+VER=2.1.5
+
+# default values {
: ${DIST=ArchLabs} # distro name if not set
-MNT=/mnt # install mountpoint
-ANS=/tmp/ans # dialog answer file
-BOOTDIR=boot # location to mount boot partition
+MNT=/mnt # installation root mountpoint
+ANS=/tmp/ans # dialog answer output file
FONT=ter-i16n # font used for the linux console
-HOOKS=shutdown # list of additional mkinitcpio HOOKS
+HOOKS=shutdown # additional mkinitcpio HOOKS
SEL=0 # currently selected menu item
-SYS=Unknown # bios type to be determined: UEFI/BIOS
-ERR=/tmp/errlog # error log used internally
-DBG=/tmp/debuglog # debug log when passed -d
+SYS=Unknown # bios type, to be determined: UEFI/BIOS
+ERR=/tmp/errlog # stderr log used internally by errshow()
+DBG=/tmp/debuglog # debug log file when passed -d
RUN=/run/archiso/bootmnt/arch/boot # path for live system /boot
VM="$(dmesg | grep -i hypervisor)" # system running in a virtual machine
-export DIALOGOPTS="--cr-wrap" # see `man dialog`
+EXMNTS="" # extra partitions that were mounted, used to verify mountpoint and show user
+FORMATTED="" # partitions that have been formatted, allows skipping the format step
+USER_CMD="" # optional command(s) entered by the user to run in the chroot
+export DIALOGOPTS="--cr-wrap" # dialog environment variable to hold default options, see `man dialog`
BASE_PKGS="base xorg xorg-drivers sudo git gvfs gtk3 libmad libmatroska tumbler "
BASE_PKGS+="playerctl pulseaudio pulseaudio-alsa pavucontrol pamixer scrot xdg-user-dirs "
# executable name for each wm/de used in ~/.xinitrc {
declare -A WM_SESSIONS=(
-[dwm]='dwm' [i3-gaps]='i3' [bspwm]='bspwm' [awesome]='awesome' [plasma]='startkde' [xfce4]='startxfce4'
+[dwm]='dwm' [jwm]='jwm' [i3-gaps]='i3' [bspwm]='bspwm' [awesome]='awesome' [plasma]='startkde' [xfce4]='startxfce4'
[gnome]='gnome-session' [fluxbox]='startfluxbox' [openbox]='openbox-session' [cinnamon]='cinnamon-session'
) # }
# packages installed for each wm/de, most are depends of the skel packages {
declare -A WM_EXT=(
-[dwm]='' [gnome]='' [cinnamon]='gnome-terminal' [plasma]='kdebase-meta'
+[dwm]='' [jwm]='' [gnome]='' [cinnamon]='gnome-terminal' [plasma]='kdebase-meta'
[awesome]='archlabs-skel-awesome' [bspwm]='archlabs-skel-bspwm' [fluxbox]='archlabs-skel-fluxbox'
[i3-gaps]='archlabs-skel-i3-gaps' [openbox]='archlabs-skel-openbox' [xfce4]='archlabs-skel-xfce4 xfce4-goodies'
) # }
# they can be added here eg. [package]="extra"
declare -A PKG_EXT=(
[vlc]='qt4' [mpd]='mpc' [mupdf]='mupdf-tools'
-[rxvt-unicode]='urxvt-pearls' [zathura]='zathura-pdf-poppler' [noto-fonts]='noto-fonts-emoji' [cairo-dock]='cairo-dock-plug-ins' [qt5ct]='qt5-styleplugins'
+[rxvt-unicode]='urxvt-perls' [zathura]='zathura-pdf-poppler' [noto-fonts]='noto-fonts-emoji' [cairo-dock]='cairo-dock-plug-ins' [qt5ct]='qt5-styleplugins'
[vlc]='qt5ct qt5-styleplugins' [qutebrowser]='qt5ct qt5-styleplugins' [qbittorrent]='qt5ct qt5-styleplugins' [transmission-qt]='qt5ct qt5-styleplugins'
[bluez]='bluez-libs bluez-utils bluez-tools bluez-plugins bluez-hid2hci' [kdenlive]='kdebase-meta dvdauthor frei0r-plugins breeze breeze-gtk qt5ct qt5-styleplugins'
) # }
_welcome="\nThis will help you get $DIST installed and setup on your system.\n\nIf you are unsure about a section the default option will be listed or\nthe first selected item will be the default.\n\n\nMenu Navigation:\n\n - Select items with the arrow keys or the option number.\n - Use [Space] to toggle check boxes and [Enter] to accept.\n - Switch between fields using [Tab] or the arrow keys.\n - Use [Page Up] and [Page Down] to jump whole pages\n - Press the highlighted key of an option to select it.\n"
_keymap="\nPick which keymap to use for the system from the list below\n\nThis is used once a graphical environment is running (Xorg).\n\nSystem default: us"
_vconsole="\nSelect the console keymap, the console is the tty shell you reach before starting a graphical environment (Xorg).\n\nIts keymap is seperate from the one used by the graphical environments, though many do use the same such as 'us' English.\n\nSystem default: us"
+_prep="\nThis is the installer main menu, once a step is complete you will return here.\n\nOn successful completion of a step the cursor will be advanced to the next step\nOn failure the cursor will be placed on the step required to advance (when possible).\n\nSteps beginning with an asterix (*) are required.\n\nOnce you're happy with the choices and the required steps are complete, selecting the final step will begin the install."
_device="\nSelect a device to use from the list below.\n\nDevices (/dev) are the available drives on the system. /sda, /sdb, /sdc ..."
_resize="\nSelect a new filesystem size in MB, a new partition will be created from the free space but will be left unformatted.\nThe lowest size is just enough to fit the currently in use space on the partition while the default is set to split the free space evenly.\n\nUse Tab or the arrow keys move the cursor between the buttons and the value, when the cursor is on the value, you can edit it by:\n\n - left/right cursor movement to select a digit to modify\n - +/- characters to increment/decrement the digit by one\n - 0 through 9 to set the digit to the given value\n\nSome keys are also recognized in all cursor positions:\n\n - Home/End set the value to its maximum or minimum\n - Pageup/Pagedown increment the value so that the slider moves by one column."
_mount="\nUse [Space] to toggle mount options from below, press [Enter] when done to confirm selection.\n\nNot selecting any and confirming will run an automatic mount."
_login="\nSelect which of your session choices to use for the initial login.\n\nYou can be change this later by editing your ~/.xinitrc"
_autologin="\nDo you want autologin enabled for USER?\n\nIf so the following two files will be created (disable autologin by removing them):\n\n - /home/USER/RC (run startx when logging in on tty1)\n - /etc/systemd/system/getty@tty1.service.d/autologin.conf (login USER without password)\n"
_packages="\nUse [Space] to move a package into the selected area and press [Enter] to accept the selection.\n\nPackages may be installed by your DE/WM (if any), or for the packages you select."
+_usercmd="\nEnter command to be run in the newly installed system (chroot) below.\n\nAn example use case would be installing packages or editing files not offered in the menus.\n\nBecause the command will be run in a chroot not every command will function correctly, additionally the command will not be sanity checked, it's your system so exercise caution.\n\nMore than one command may be run using standard bash syntax.\n"
_edit="\nBefore exiting you can select configuration files to review/change.\n\nIf you need to make other changes with the drives still mounted, use Ctrl-z to pause the installer, when finished type 'fg' and [Enter] to resume the installer, if you want to avoid the automatic reboot using Ctrl-c will cleanly exit."
# LUKS
main()
{
- (( SEL < 12 )) && (( SEL++ ))
+ (( SEL < 13 )) && (( SEL++ ))
tput civis
dialog --backtitle "$DIST Installer - $SYS - v$VER" --title " Prepare " --default-item $SEL --cancel-label 'Exit' --menu "$_prep" 0 0 0 \
- 1 "Device tree (optional)" \
- 2 "Partitioning (optional)" \
- 3 "LUKS setup (optional)" \
- 4 "LVM setup (optional)" \
- 5 "Mount partitions" \
- 6 "System bootloader" \
- 7 "User and password" \
- 8 "System configuration" \
- 9 "Select WM/DE (optional)" \
- 10 "Select Packages (optional)" \
- 11 "View configuration (optional)" \
- 12 "Start the installation" 2>"$ANS"
+ 1 "Show device tree" \
+ 2 "Partitioning" \
+ 3 "LUKS encryption" \
+ 4 "Logical volume management" \
+ 5 "* Mount partitions" \
+ 6 "* Select bootloader" \
+ 7 "* Username and password" \
+ 8 "* System configuration" \
+ 9 "Select window manager or desktop" \
+ 10 "Select additional packages" \
+ 11 "Run a command on the installed system" \
+ 12 "View configuration and command selections" \
+ 13 "* Confirm choices and start the installation" 2> "$ANS"
read -r SEL < "$ANS"
[[ -z $WARN && $SEL =~ (2|5) ]] && { msg "Data Warning" "$_warn"; WARN=true; }
8) prechecks 2 && { select_config || (( SEL-- )); } ;;
9) prechecks 3 && { select_sessions || (( SEL-- )); } ;;
10) prechecks 3 && { select_packages || (( SEL-- )); } ;;
- 11) prechecks 3 && select_show ;;
- 12) prechecks 3 && install_main ;;
+ 11) prechecks 3 && select_usercmd ;;
+ 12) prechecks 3 && select_show ;;
+ 13) prechecks 3 && install_main ;;
*) yesno "Exit" "\nUnmount partitions (if any) and exit the installer?\n" && die 0
esac
}
Hostname: ${MYHOST:-none}
Timezone: ${ZONE:-none}/${SUBZ:-none}
+ Chroot cmd: ${USER_CMD:-none}
+
------------ USER CONFIGURATION ---------------
Username: ${NEWUSER:-none}
select_login()
{
- [[ $INSTALL_WMS ]] || return 0
-
AUTOLOGIN='' # no autologin unless using xinit
dlg LOGIN_TYPE menu "Login Management" "\nSelect what kind of login management to use." \
"sddm" "Simple desktop display manager" || return 1
case $LOGIN_TYPE in
- ly) EDIT_FILES[login]="/etc/ly/config.ini" ;;
gdm|sddm) EDIT_FILES[login]="" ;;
+ ly) EDIT_FILES[login]="/etc/ly/config.ini" ;;
lightdm) EDIT_FILES[login]="/etc/lightdm/lightdm.conf /etc/lightdm/lightdm-gtk-greeter.conf" ;;
xinit) EDIT_FILES[login]="/home/$NEWUSER/.xinitrc /home/$NEWUSER/.xprofile"
if (( $(wc -w <<< "$INSTALL_WMS") > 1 )); then
"Password2:" 3 1 '' 3 12 "$COLUMNS" 0 1 \
"--- Root password, if left empty the user password will be used ---" 6 1 '' 6 68 "$COLUMNS" 0 2 \
"Password:" 8 1 '' 8 11 "$COLUMNS" 0 1 \
- "Password2:" 9 1 '' 9 12 "$COLUMNS" 0 1 2>"$ANS" || return 1
+ "Password2:" 9 1 '' 9 12 "$COLUMNS" 0 1 2> "$ANS" || return 1
mapfile -t ans <"$ANS"
fi
if [[ $TERM == 'linux' ]]; then
- loadkeys "$CMAP" >/dev/null 2>&1
+ loadkeys "$CMAP" > /dev/null 2>&1
else
- setxkbmap "$KEYMAP" >/dev/null 2>&1
+ setxkbmap "$KEYMAP" > /dev/null 2>&1
fi
return 0
}
+select_usercmd()
+{
+ dlg USER_CMD input "User Command" "$_usercmd" "$USER_CMD" nolimit
+}
+
select_sessions()
{
LOGIN_CHOICES=''
dlg INSTALL_WMS check "Sessions" "$_sessions\n" \
- openbox "A lightweight, powerful, and highly configurable stacking wm" "$(ofn openbox "${INSTALL_WMS[*]}")" \
i3-gaps "A fork of i3wm with more features including gaps" "$(ofn i3-gaps "${INSTALL_WMS[*]}")" \
+ openbox "A lightweight, powerful, and highly configurable stacking wm" "$(ofn openbox "${INSTALL_WMS[*]}")" \
dwm "A dynamic WM for X that manages windows in tiled, floating, or monocle layouts" "$(ofn dwm "${INSTALL_WMS[*]}")" \
bspwm "A tiling wm that represents windows as the leaves of a binary tree" "$(ofn bspwm "${INSTALL_WMS[*]}")" \
+ jwm "A lightweight window manager for Xorg written in C" "$(ofn jwm "${INSTALL_WMS[*]}")" \
xfce4 "A lightweight and modular desktop environment based on gtk+2/3" "$(ofn xfce4 "${INSTALL_WMS[*]}")" \
awesome "A customized Awesome WM session created by @elanapan" "$(ofn awesome "${INSTALL_WMS[*]}")" \
fluxbox "A lightweight and highly-configurable window manager" "$(ofn fluxbox "${INSTALL_WMS[*]}")" \
cinnamon "A desktop environment combining traditional desktop with modern effects" "$(ofn cinnamon "${INSTALL_WMS[*]}")"
[[ $INSTALL_WMS ]] || return 0
-
- WM_PKGS="${INSTALL_WMS/dwm/}" # remove dwm from package list
- WM_PKGS="${WM_PKGS// / }" # remove double spaces
- WM_PKGS="${WM_PKGS# }" # remove leading space
+ WM_PKGS="${INSTALL_WMS/dwm/}"
+ WM_PKGS="${WM_PKGS// / }"
+ WM_PKGS="${WM_PKGS# }"
for i in $INSTALL_WMS; do
LOGIN_CHOICES+="$i - "
choice=""
dlg choice menu "Edit Partitions" "$_part\n\n$(lsblk -no NAME,MODEL,SIZE,TYPE,FSTYPE $device)" \
"auto" "Whole device automatic partitioning" \
- "shrink" "Shrink an existing ext or ntfs partition" \
"cfdisk" "Curses based variant of fdisk" \
- "parted" "GNU partition editor" \
+ "parted" "GNU partition editor" $([[ $DISPLAY ]] && hash gparted >/dev/null 2>&1 && printf "gparted 'A gui front end to parted'") \
"fdisk" "Dialog-driven creation and manipulation of partitions" \
"done" "Return to the main menu"
+ # "shrink" "Shrink an existing ext or ntfs partition" \
if [[ -z $choice || $choice == 'done' ]]; then
return 0
elif [[ $choice == 'shrink' ]]; then
part_shrink "$device"
elif [[ $choice == 'auto' ]]; then
- local root_size txt table boot_fs
- root_size=$(lsblk -lno SIZE "$device" | awk 'NR == 1 {
- if ($1 ~ "G") {
- sub(/G/, "")
- print ($1 * 1000 - 512) / 1000 "G"
- } else {
- sub(/M/, "")
- print ($1 - 512) "M"
- }
- }')
+ local root_size txt label boot_fs boot_type
+ root_size=$(lsblk -lno SIZE "$device" | awk 'NR == 1 {if ($1 ~ "G") {sub(/G/, ""); print ($1 * 1000 - 512) / 1000 "G"} else {sub(/M/, ""); print ($1 - 512) "M"}}')
txt="\nWARNING:\n\nALL data on $device will be destroyed and the following partitions will be created\n\n- "
if [[ $SYS == 'BIOS' ]]; then
- table="msdos" boot_fs="ext4"
+ label="msdos" boot_fs="ext4" boot_type="primary"
txt+="An $boot_fs boot partition with the boot flag enabled (512M)\n- "
else
- table="gpt" boot_fs="fat32"
+ label="gpt" boot_fs="fat32" boot_type="ESP"
txt+="A $boot_fs efi boot partition (512M)\n- "
fi
txt+="An ext4 partition using all remaining space ($root_size)\n\nDo you want to continue?\n"
- yesno "Auto Partition" "$txt" && part_auto "$device" "$table" "$boot_fs" "$root_size"
+ yesno "Auto Partition" "$txt" && part_auto "$device" "$label" "$boot_fs" "$root_size" "$boot_type"
else
clear
tput cnorm
fi
if [[ $devhash != "$(lsblk -f | base64)" ]]; then
msg "Probing Partitions" "\nInforming kernel of partition changes using partprobe\n" 0
- partprobe >/dev/null 2>&1
+ partprobe > /dev/null 2>&1
[[ $choice == 'auto' ]] && return
fi
done
part_auto()
{
- local device="$1" table="$2" boot_fs="$3" size="$4" dev_info=""
+ local device="$1" label="$2" boot_fs="$3" size="$4" boot_type="$5" dev_info=""
- msg "Auto Partition" "\nRemoving partitions on $device and setting table to $table\n" 1
+ msg "Auto Partition" "\nRemoving partitions on $device and setting label to $label\n" 1
- dev_info="$(parted -s "$device" print)"
+ dev_info="$(parted -s "$device" print 2> /dev/null)"
swapoff -a
while read -r PART; do
- parted -s "$device" rm "$PART" >/dev/null 2>&1
+ [[ $PART ]] || continue
+ parted -s "$device" rm "$PART" > /dev/null 2> "$ERR"
+ errshow 0 "parted -s $device rm $PART" || return 1
done <<< "$(awk '/^ [1-9][0-9]?/ {print $1}' <<< "$dev_info" | sort -r)"
- [[ $(awk '/Table:/ {print $3}' <<< "$dev_info") != "$table" ]] && parted -s "$device" mklabel "$table" >/dev/null 2>&1
+ [[ $(awk '/Table:/ {print $3}' <<< "$dev_info") != "$label" ]] && parted -s "$device" mklabel "$label" > /dev/null 2> "$ERR"
msg "Auto Partition" "\nCreating a 512M $boot_fs boot partition.\n" 1
- if [[ $SYS == "BIOS" ]]; then
- parted -s "$device" mkpart primary "$boot_fs" 1MiB 513MiB >/dev/null 2>&1
- else
- parted -s "$device" mkpart ESP "$boot_fs" 1MiB 513MiB >/dev/null 2>&1
- fi
+ parted -s "$device" mkpart "$boot_type" "$boot_fs" 1MiB 513MiB > /dev/null 2> "$ERR"
+ errshow 0 "parted -s $device mkpart $boot_type $boot_fs 1MiB 513MiB" || return 1
sleep 0.5
BOOT_DEV="$device"
AUTO_BOOT_PART=$(lsblk -lno NAME,TYPE "$device" | awk 'NR==2 {print "/dev/" $1}')
if [[ $SYS == "BIOS" ]]; then
- mkfs.ext4 -q "$AUTO_BOOT_PART" >/dev/null 2>&1
+ mkfs.ext4 -q "$AUTO_BOOT_PART" > /dev/null 2> "$ERR"
+ errshow 0 "mkfs.ext4 -q $AUTO_BOOT_PART" || return 1
else
- mkfs.vfat -F32 "$AUTO_BOOT_PART" >/dev/null 2>&1
+ mkfs.vfat -F32 "$AUTO_BOOT_PART" > /dev/null 2> "$ERR"
+ errshow 0 "mkfs.vfat -F32 $AUTO_BOOT_PART" || return 1
fi
msg "Auto Partition" "\nCreating a $size ext4 root partition.\n" 0
- parted -s "$device" mkpart primary ext4 513MiB 100% >/dev/null 2>&1
+ parted -s "$device" mkpart primary ext4 513MiB 100% > /dev/null 2> "$ERR"
+ errshow 0 "parted -s $device mkpart primary ext4 513MiB 100%" || return 1
sleep 0.5
AUTO_ROOT_PART="$(lsblk -lno NAME,TYPE "$device" | awk 'NR==3 {print "/dev/" $1}')"
- mkfs.ext4 -q "$AUTO_ROOT_PART" >/dev/null 2>&1
+ mkfs.ext4 -q "$AUTO_ROOT_PART" > /dev/null 2> "$ERR"
+ errshow 0 "mkfs.ext4 -q $AUTO_ROOT_PART" || return 1
sleep 0.5
msg "Auto Partition" "\nProcess complete.\n\n$(lsblk -o NAME,MODEL,SIZE,TYPE,FSTYPE "$device")\n"
}
num="${part: -1}"
end=$(parted -s "$device" unit KiB print | awk '/^\s*'"$num"'/ {print $3}') # part size in KiB
devsize=$(parted -s "$device" unit KiB print | awk '/Disk '"${device//\//\\/}"':/ {print $3}') # whole device size in KiB
- mount "$part" "$MNT" >/dev/null 2>&1; sleep 0.5
+ mount "$part" "$MNT" > /dev/null 2>&1; sleep 0.5
min=$(df --output=used --block-size=MiB "$part" | awk 'NR == 2 {print int($1) + 256}')
max=$(df --output=avail --block-size=MiB "$part" | awk 'NR == 2 {print int($1)}')
umount_dir "$MNT"
tput cnorm
- if dialog --backtitle "$DIST Installer - $SYS - v$VER" --title " Resize: $part " --rangebox "$_resize" 17 "$COLUMNS" "$min" "$max" $((max / 2)) 2>$ANS; then
+ if dialog --backtitle "$DIST Installer - $SYS - v$VER" --title " Resize: $part " --rangebox "$_resize" 17 "$COLUMNS" "$min" "$max" $((max / 2)) 2> $ANS; then
size=$(< "$ANS")
size=$((size * 1024))
else
case "$fs" in
ntfs)
if ntfsresize -fc "$part"; then
- ntfsresize -ff --size $(( (size * 1024) / 1000 ))k "$part" 2>$ERR # k=10^3 bytes
- errshow "ntfsresize -f -s $(( (size * 1024) / 1000 ))k $part" || return 1
+ ntfsresize -ff --size $(( (size * 1024) / 1000 ))k "$part" 2> "$ERR" # k=10^3 bytes
+ errshow 0 "ntfsresize -f -s $(( (size * 1024) / 1000 ))k $part" || return 1
else
msg "Resize" "\nThe ntfs partition $part cannot be resized because it is scheduled for a consistency check.\n\nTo do a consistency check in windows open command prompt as admin and run:\n\n\tchkdsk /f /r /x\n"
return 1
;;
*)
e2fsck -f "$part"; sleep 0.5
- resize2fs -f "$part" ${size}K 2>$ERR # K=2^10 bytes
- errshow "resize2fs -f $part ${size}K" || return 1
+ resize2fs -f "$part" ${size}K 2> "$ERR" # K=2^10 bytes
+ errshow 0 "resize2fs -f $part ${size}K" || return 1
;;
esac
sleep 0.5
(( size++ ))
sleep 0.5
if [[ $devsize == "$end" ]]; then
- parted -s "$device" mkpart primary ext4 ${size}KiB 100% 2>$ERR
- errshow "parted -s $device mkpart primary ext4 ${size}KiB 100%" || return 1
+ parted -s "$device" mkpart primary ext4 ${size}KiB 100% 2> "$ERR"
+ errshow 0 "parted -s $device mkpart primary ext4 ${size}KiB 100%" || return 1
else
- parted -s "$device" mkpart primary ext4 ${size}KiB ${end}KiB 2>$ERR
- errshow "parted -s $device mkpart primary ext4 ${size}KiB ${end}KiB" || return 1
+ parted -s "$device" mkpart primary ext4 ${size}KiB ${end}KiB 2> "$ERR"
+ errshow 0 "parted -s $device mkpart primary ext4 ${size}KiB ${end}KiB" || return 1
fi
msg "Resize Complete" "\n$part has been successfully resized to $((size / 1024))M.\n" 1
;;
part_find()
{
local regexp="$1" err=''
+ local pts dev size isize ptcount=0
# string of partitions as /TYPE/PART SIZE.. eg. /dev/sda1 256G
if [[ $IGNORE_DEV ]]; then
# ensure we have enough partitions for the system and action were trying to do
COUNT=$(wc -l <<< "$PARTS")
+
+ while read -r dev size; do # walk partition list and skip ones that are too small
+ [[ $dev && $size ]] || continue
+ size_t="${size: -1:1}"
+ isize=${size:0:-1}
+ isize=${isize%.*}
+ [[ $size_t == 'K' || ($size_t == 'M' && $isize -lt 100) ]] || { pts+="$dev $size "; (( ptcount++ )); }
+ done <<< "$PARTS"
+
case "$regexp" in
- 'part|lvm|crypt') [[ $COUNT -lt 1 || ($SYS == 'UEFI' && $COUNT -lt 2) ]] && err="$_errpart" ;;
- 'part|crypt') (( COUNT < 1 )) && err="$_lvmerr" ;;
- 'part|lvm') (( COUNT < 2 )) && err="$_lukserr" ;;
+ 'part|lvm|crypt') [[ $ptcount -lt 1 || ($SYS == 'UEFI' && $COUNT -lt 2) ]] && err="$_errpart" ;;
+ 'part|crypt') (( ptcount < 1 )) && err="$_lvmerr" ;;
+ 'part|lvm') (( ptcount < 2 )) && err="$_lukserr" ;;
esac
if [[ $err ]]; then
part_swap()
{
if [[ $1 == "$MNT/swapfile" && $SWAP_SIZE ]]; then
- fallocate -l $SWAP_SIZE "$1" 2>$ERR
- errshow "fallocate -l $SWAP_SIZE $1"
- chmod 600 "$1" 2>$ERR
- errshow "chmod 600 $1"
+ fallocate -l $SWAP_SIZE "$1" 2> "$ERR"
+ errshow 0 "fallocate -l $SWAP_SIZE $1"
+ chmod 600 "$1" 2> "$ERR"
+ errshow 0 "chmod 600 $1"
fi
- mkswap "$1" >/dev/null 2>$ERR
- errshow "mkswap $1"
- swapon "$1" >/dev/null 2>$ERR
- errshow "swapon $1"
+ mkswap "$1" > /dev/null 2> "$ERR"
+ errshow 0 "mkswap $1"
+ swapon "$1" > /dev/null 2> "$ERR"
+ errshow 0 "swapon $1"
return 0
}
mkdir -p "$mountp"
if [[ $fs && ${FS_OPTS[$fs]} && $part != "$BOOT_PART" && $part != "$AUTO_ROOT_PART" ]] && select_mntopts "$fs"; then
- mount -o "$MNT_OPTS" "$part" "$mountp" >/dev/null 2>&1
+ mount -o "$MNT_OPTS" "$part" "$mountp" > /dev/null 2>&1
else
- mount "$part" "$mountp" >/dev/null 2>&1
+ mount "$part" "$mountp" > /dev/null 2>&1
fi
part_mountconf "$part" "$mountp" || return 1
local part="$1" fs="$2" delay="$3"
msg "Format" "\nFormatting $part as $fs\n" 0
- mkfs.$fs ${FS_CMD_FLAGS[$fs]} "$part" >/dev/null 2>$ERR
- errshow "mkfs.$fs ${FS_CMD_FLAGS[$fs]} "$part"" || return 1
+ mkfs.$fs ${FS_CMD_FLAGS[$fs]} "$part" > /dev/null 2> "$ERR"
+ errshow 0 "mkfs.$fs ${FS_CMD_FLAGS[$fs]} "$part"" || return 1
FORMATTED+="$part "
sleep $delay
}
BOOT_PART_NUM="${BOOT_PART: -1}"
[[ $BOOT_PART = /dev/nvme* ]] && BOOT_DEV="${BOOT_PART%p[1-9]}"
if [[ $SYS == 'UEFI' ]]; then
- parted -s $BOOT_DEV set $BOOT_PART_NUM esp on >/dev/null 2>&1
+ parted -s $BOOT_DEV set $BOOT_PART_NUM esp on > /dev/null 2>&1
else
- parted -s $BOOT_DEV set $BOOT_PART_NUM boot on >/dev/null 2>&1
+ parted -s $BOOT_DEV set $BOOT_PART_NUM boot on > /dev/null 2>&1
fi
return 0
}
mount_menu()
{
+ msg "Mount Menu" "\nGathering device and partition information.\n" 1
no_bg_install || return 0
lvm_detect
umount_dir "$MNT"
select_root_partition || { ROOT_PART=''; return 1; }
select_boot_partition || { BOOT_PART=''; return 1; }
if [[ $BOOT_PART ]]; then
- part_mount "$BOOT_PART" "/$BOOTDIR" && SEP_BOOT=true || return 1
+ part_mount "$BOOT_PART" "/boot" && SEP_BOOT=true || return 1
part_bootdev
fi
select_swap || return 1
{
local pts dev size isize
- while read -r dev size; do # walk partition list and skip ones that are too small/big for swap
- size_t="${size: -1:1}"
- isize=${size:0:-1}
- isize=${isize%.*}
- [[ $size_t =~ [KT] || ($size_t == 'G' && $isize -gt 16) || ($size_t == 'M' && $isize -lt 100) ]] || pts+="$dev $size "
- done <<< "$PARTS"
+ if (( COUNT )) ; then
+ while read -r dev size; do # walk partition list and skip ones that are too small/big for swap
+ size_t="${size: -1:1}"
+ isize=${size:0:-1}
+ isize=${isize%.*}
+ [[ $size_t =~ [KT] || ($size_t == 'G' && $isize -gt 16) || ($size_t == 'M' && $isize -lt 100) ]] || pts+="$dev $size "
+ done <<< "$PARTS"
+ fi
dlg SWAP_PART menu "Swap Setup" "\nSelect whether to use a swapfile, swap partition, or none." \
"none" "Don't allocate any swap space" \
EXMNT=''
fi
done
- msg "Mount Extra" "\nMounting Finished\n\n\nNo extra partitions available to mount, returning to main menu.\n" 2
return 0
}
{
local part="$1" fs='' cur=''
local txt="\nSelect which filesystem to use for: $part\n\nDefault: ext4"
- cur="$(lsblk -lno FSTYPE "$part" 2>/dev/null)"
+ cur="$(lsblk -lno FSTYPE "$part" 2> /dev/null)"
# bail early if the partition was created in part_auto()
[[ $cur && $part == "$AUTO_ROOT_PART" ]] && return 0
until [[ $fs ]]; do
- if [[ $cur && $FORMATTED == *"$part"* ]]; then
+ if [[ $cur && $part != "$ROOT_PART" ]]; then
dlg fs menu "Filesystem" "$txt\nCurrent: $cur" skip - ext4 - ext3 - ext2 - vfat - ntfs - f2fs - jfs - xfs - nilfs2 - reiserfs - || return 1
else
dlg fs menu "Filesystem" "$txt" ext4 - ext3 - ext2 - vfat - ntfs - f2fs - jfs - xfs - nilfs2 - reiserfs - || return 1
BOOT_PART="$AUTO_BOOT_PART"
return 0
else
- while read -r dev size; do # walk partition list and skip ones that are too small/big for boot
- size_t="${size: -1:1}"
- isize=${size:0:-1}
- isize=${isize%.*}
- [[ $size_t =~ [KT] || ($size_t == 'G' && $isize -gt 2) || ($size_t == 'M' && $isize -lt 100) ]] || { pts+="$dev $size "; (( ptcount++ )); }
- done <<< "$PARTS"
+ if (( COUNT )); then
+ while read -r dev size; do # walk partition list and skip ones that are too small/big for boot
+ size_t="${size: -1:1}"
+ isize=${size:0:-1}
+ isize=${isize%.*}
+ [[ $size_t =~ [KT] || ($size_t == 'G' && $isize -gt 2) || ($size_t == 'M' && $isize -lt 100) ]] || { pts+="$dev $size "; (( ptcount++ )); }
+ done <<< "$PARTS"
+ fi
case "$SYS" in
UEFI)
[[ $BOOT_PART ]] || return 1
;;
BIOS)
- (( ptcount == 0 )) && return 0
if [[ $LUKS && ! $LVM ]]; then
- dlg BOOT_PART menu "Boot Partition" "$_biosluks" $pts
+ case "$ptcount" in
+ 0) msg "Boot Partition" "\nLUKS without LVM requires a separate boot partition.\nNo partitions available that meet size requirements!!\n\nReturning to the main menu.\n" 2; return 1 ;;
+ 1) msg "Boot Partition" "\nOnly one partition available that meets size requirements.\n" 1; BOOT_PART="$(awk 'NF > 0 {print $1}' <<< "$pts")" ;;
+ *) dlg BOOT_PART menu "Boot Partition" "$_biosluks" $pts ;;
+ esac
[[ $BOOT_PART ]] || return 1
else
+ (( ptcount == 0 )) && return 0
dlg BOOT_PART menu "Boot Partition" "$_bios" "skip" "no separate boot" $pts
[[ -z $BOOT_PART || $BOOT_PART == "skip" ]] && { BOOT_PART=''; return 0; }
fi
local part dev size
# walk partition list and skip ones that are too small to be usable
- while read -r dev size; do
- [[ ${size: -1:1} =~ [KM] ]] && part_countdec "$dev"
- done <<< "$PARTS"
+ if (( COUNT )); then
+ while read -r dev size; do
+ [[ ${size: -1:1} =~ [KM] ]] && part_countdec "$dev"
+ done <<< "$PARTS"
+ fi
- while (( COUNT > 0 )); do
+ while (( COUNT )); do
part=''
dlg part menu 'Mount Extra' "$_expart" 'done' 'finish mounting step' $PARTS || break
if [[ $part == 'done' ]]; then
return 1
fi
done
+ (( COUNT == 0 )) && msg "Mount Extra" "\nMounting Finished\n\n\nNo extra partitions available to mount, returning to main menu.\n" 2
return 0
}
install_main()
{
install_base
- genfstab -U "$MNT" >"$MNT/etc/fstab" 2>$ERR 2>&1
- errshow 1 "genfstab -U $MNT >$MNT/etc/fstab"
+ genfstab -U "$MNT" > "$MNT/etc/fstab" 2> "$ERR"
+ errshow 1 "genfstab -U $MNT > $MNT/etc/fstab"
[[ -f $MNT/swapfile ]] && sed -i "s~${MNT}~~" "$MNT/etc/fstab"
install_packages
+ # tear free configs, MUST be done after package install for nvidia
+ [[ $TEARFREE ]] && install_tearfree_conf "$MNT/etc/X11/xorg.conf.d"
install_mkinitcpio
install_boot
chrun "hwclock --systohc --utc" || chrun "hwclock --systohc --utc --directisa"
install_user
install_login
chrun "chown -Rf $NEWUSER:users /home/$NEWUSER"
+ if [[ "$USER_CMD" ]]; then
+ chrun "$USER_CMD" 2> "$ERR" 2>&1
+ errshow 0 "$USER_CMD"
+ fi
while :; do
dlg choice menu "Finalization" "$_edit" \
login "${EDIT_FILES[login]}"
if [[ -z $choice || $choice == 'finished' ]]; then
- [[ $DEBUG == true && -r $DBG ]] && ${EDITOR:-vim} $DBG
- clear && die 127
+ [[ $DEBUG == true && -r $DBG ]] && ${EDITOR:-vim} "$DBG"
+ clear
+ die 127
else
local exists=''
for f in ${EDIT_FILES[$choice]}; do
- [[ -e ${MNT}$f ]] && exists+=" ${MNT}$f"
+ if [[ -e ${MNT}$f ]]; then
+ ${EDITOR:-vim} "${MNT}$f"
+ else
+ msg "File Missing" "\nThe file(s) selected do not exist:\n\n${MNT}$f\n"
+ fi
done
- if [[ $exists ]]; then
- ${EDITOR:-vim} -O $exists
- else
- msg "File Missing" "\nThe file(s) selected do not exist:\n\n${EDIT_FILES[$choice]}\n"
- fi
fi
done
}
{
clear
tput cnorm
- while kill -0 $BG_PID 2>/dev/null; do
+ while kill -0 $BG_PID 2> /dev/null; do
clear; printf "\nA background install process is still running...\n"; sleep 1
done
trap - EXIT
unset BG_PID
+ # archiso files
rm -rf "$MNT/etc/mkinitcpio-archiso.conf"
find "$MNT/usr/lib/initcpio" -name 'archiso*' -type f -delete
+
+ # remove/disable customizations done to airootfs during building
+ chrun "systemctl disable pacman-init.service choose-mirror.service" > /dev/null 2>&1
+ rm -f "$MNT/etc/systemd/scripts/choose-mirror"
+ rm -f "$MNT/etc/systemd/system/"{choose-mirror.service,etc-pacman.d-gnupg.mount,pacman-init.service}
sed -i 's/#\(Storage=\)volatile/\1auto/' "$MNT/etc/systemd/journald.conf"
+ sed -i 's/#\(HandleSuspendKey=\)ignore/\1suspend/' "$MNT/etc/systemd/logind.conf"
+ sed -i 's/#\(HandleHibernateKey=\)ignore/\1hibernate/' "$MNT/etc/systemd/logind.conf"
+ sed -i 's/#\(HandleLidSwitch=\)ignore/\1suspend/' "$MNT/etc/systemd/logind.conf"
find "$MNT/boot" -name '*-ucode.img' -delete
+ # changing distro name?
[[ $DIST != "ArchLabs" ]] || sed -i "s/ArchLabs/$DIST/g" "$MNT/etc/"{lsb-release,os-release}
- if [[ $VM ]]; then
- echo "Virtual machine detected, removing xorg configs"
- find "$MNT/etc/X11/xorg.conf.d/" -name '*.conf' -delete -printf "remove %p\n"
- elif lspci | grep ' VGA ' | grep -q 'Intel'; then
- echo "Creating Intel Tear Free config /etc/X11/xorg.conf.d/20-intel.conf"
- cat > "$MNT/etc/X11/xorg.conf.d/20-intel.conf" <<- EOF
- Section "Device"
- Identifier "Intel Graphics"
- Driver "intel"
- Option "TearFree" "true"
- EndSection
- EOF
- elif lspci | grep ' VGA ' | grep -q 'AMD/ATI.*RX'; then # newer RX cards can use the amdgpu driver
- echo "Creating AMD Tear Free config /etc/X11/xorg.conf.d/20-amdgpu.conf"
- cat > "$MNT/etc/X11/xorg.conf.d/20-amdgpu.conf" <<- EOF
- Section "Device"
- Identifier "AMD Graphics"
- Driver "amdgpu"
- Option "TearFree" "true"
- EndSection
- EOF
- elif lspci | grep ' VGA ' | grep -q 'AMD/ATI.*HD [2-6][0-9]*'; then # older HD 2xxx-6xxx cards must use the radeon driver
- echo "Creating Radeon Tear Free config /etc/X11/xorg.conf.d/20-radeon.conf"
- cat > "$MNT/etc/X11/xorg.conf.d/20-radeon.conf" <<- EOF
- Section "Device"
- Identifier "AMD Graphics"
- Driver "radeon"
- Option "TearFree" "on"
- EndSection
- EOF
- fi
+ # vmlinuz, if this isn't copied the standard kernel may fail mkinitcpio
+ cp -vf "$RUN/x86_64/vmlinuz" "$MNT/boot/vmlinuz-linux" 2> "$ERR" 2>&1
+ errshow 1 "cp -vf $RUN/x86_64/vmlinuz $MNT/boot/vmlinuz-linux"
- if [[ -e /run/archiso/sfs/airootfs ]]; then
- cp -vf "$RUN/x86_64/vmlinuz" "$MNT/boot/vmlinuz-linux" 2>$ERR 2>&1
- errshow 1 "cp -vf $RUN/x86_64/vmlinuz $MNT/boot/vmlinuz-linux"
- fi
+ # copy network settings
[[ -d /etc/netctl ]] && cp -rfv /etc/netctl "$MNT/etc/"
[[ -f /etc/resolv.conf ]] && cp -fv /etc/resolv.conf "$MNT/etc/"
[[ -e /etc/NetworkManager/system-connections ]] && cp -rvf /etc/NetworkManager/system-connections "$MNT/etc/NetworkManager/"
BACKSPACE="guess"
EOF
printf "KEYMAP=%s\nFONT=%s\n" "$CMAP" "$FONT" > "$MNT/etc/vconsole.conf"
+
echo "$MYHOST" > "$MNT/etc/hostname"
cat > "$MNT/etc/hosts" <<- EOF
127.0.0.1 localhost
if [[ $SYS == 'UEFI' ]]; then
# remove our old install and generic BOOT/ dir
echo "Removing conflicting boot directories"
- find "$MNT/$BOOTDIR/EFI/" -maxdepth 1 -mindepth 1 -iname "$DIST" -type d -delete -printf "remove %p\n"
- find "$MNT/$BOOTDIR/EFI/" -maxdepth 1 -mindepth 1 -iname 'BOOT' -type d -delete -printf "remove %p\n"
+ find "$MNT/boot/EFI/" -maxdepth 1 -mindepth 1 -iname "$DIST" -type d -delete -printf "remove %p\n"
+ find "$MNT/boot/EFI/" -maxdepth 1 -mindepth 1 -iname 'BOOT' -type d -delete -printf "remove %p\n"
fi
prerun_$BOOTLDR
- chrun "${BCMDS[$BOOTLDR]}" 2>$ERR 2>&1
+ chrun "${BCMDS[$BOOTLDR]}" 2> "$ERR" 2>&1
errshow 1 "${BCMDS[$BOOTLDR]}"
if [[ -d $MNT/hostrun ]]; then
echo "Unmounting chroot directories"
# cleanup the bind mounts we made earlier for the grub-probe module
umount_dir "$MNT/hostrun/"{udev,lvm}
- rm -rf "$MNT/hostrun" >/dev/null 2>&1
+ rm -rf "$MNT/hostrun" > /dev/null 2>&1
fi
if [[ $SYS == 'UEFI' ]]; then
# some UEFI firmware requires a generic esp/BOOT/BOOTX64.EFI
- mkdir -pv "$MNT/$BOOTDIR/EFI/BOOT"
+ mkdir -pv "$MNT/boot/EFI/BOOT"
case "$BOOTLDR" in
- grub) cp -fv "$MNT/$BOOTDIR/EFI/$DIST/grubx64.efi" "$MNT/$BOOTDIR/EFI/BOOT/BOOTX64.EFI" ;;
- syslinux) cp -rf "$MNT/$BOOTDIR/EFI/syslinux/"* "$MNT/$BOOTDIR/EFI/BOOT/" && cp -f "$MNT/$BOOTDIR/EFI/syslinux/syslinux.efi" "$MNT/$BOOTDIR/EFI/BOOT/BOOTX64.EFI" ;;
- refind-efi) sed -i '/#extra_kernel_version_strings/ c extra_kernel_version_strings linux-hardened,linux-zen,linux-lts,linux' "$MNT/$BOOTDIR/EFI/refind/refind.conf"
- cp -fv "$MNT/$BOOTDIR/EFI/refind/refind_x64.efi" "$MNT/$BOOTDIR/EFI/BOOT/BOOTX64.EFI" ;;
+ grub) cp -fv "$MNT/boot/EFI/$DIST/grubx64.efi" "$MNT/boot/EFI/BOOT/BOOTX64.EFI" ;;
+ syslinux) cp -rf "$MNT/boot/EFI/syslinux/"* "$MNT/boot/EFI/BOOT/" && cp -f "$MNT/boot/EFI/syslinux/syslinux.efi" "$MNT/boot/EFI/BOOT/BOOTX64.EFI" ;;
+ refind-efi) sed -i '/#extra_kernel_version_strings/ c extra_kernel_version_strings linux-hardened,linux-zen,linux-lts,linux' "$MNT/boot/EFI/refind/refind.conf"
+ cp -fv "$MNT/boot/EFI/refind/refind_x64.efi" "$MNT/boot/EFI/BOOT/BOOTX64.EFI" ;;
esac
fi
install_user()
{
- local groups='audio,floppy,log,network,rfkill,scanner,storage,optical,power,wheel'
+ local groups='audio,video,floppy,log,network,rfkill,scanner,storage,optical,power,wheel'
+ [[ -e $MNT/etc/X11/xorg.conf.d/20-nvida.conf && -e $MNT/usr/bin/optirun ]] && groups+=',bumblebee'
- rm -f "$MNT/root/.zshrc" # remove welcome message from root zshrc
+ rm -f "$MNT/root/.zlogin" # remove welcome message
- chrun "chpasswd <<< 'root:$ROOT_PASS'" 2>$ERR 2>&1
+ chrun "chpasswd <<< 'root:$ROOT_PASS'" 2> "$ERR" 2>&1
errshow 1 "set root password"
if [[ $MYSHELL != 'zsh' ]]; then # root uses zsh by default
- chrun "usermod -s /bin/$MYSHELL root" 2>$ERR 2>&1
+ chrun "usermod -s /bin/$MYSHELL root" 2> "$ERR" 2>&1
errshow 1 "usermod -s /bin/$MYSHELL root"
# copy the default mkshrc to /root if it was selected
[[ $MYSHELL == 'mksh' ]] && cp -fv "$MNT/etc/skel/.mkshrc" "$MNT/root/.mkshrc"
fi
echo "Creating new user $NEWUSER and setting password"
- chrun "useradd -m -u 1000 -g users -G $groups -s /bin/$MYSHELL $NEWUSER" 2>$ERR 2>&1
+ chrun "useradd -m -u 1000 -g users -G $groups -s /bin/$MYSHELL $NEWUSER" 2> "$ERR" 2>&1
errshow 1 "useradd -m -u 1000 -g users -G $groups -s /bin/$MYSHELL $NEWUSER"
- chrun "chpasswd <<< '$NEWUSER:$USER_PASS'" 2>$ERR 2>&1
+ chrun "chpasswd <<< '$NEWUSER:$USER_PASS'" 2> "$ERR" 2>&1
errshow 1 "set $NEWUSER password"
- chrun "pamixer --unmute; gtk-update-icon-cache /usr/share/icons/ArchLabs-Dark /usr/share/icons/ArchLabs-Light /usr/share/icons/ArchLabs"
-
- if [[ $INSTALL_WMS == *dwm* ]];then
+ if [[ $INSTALL_WMS == *dwm* ]]; then
install_suckless "/home/$NEWUSER" chroot
[[ $INSTALL_WMS == 'dwm' ]] && rm -rf "$MNT/home/$NEWUSER/.config/xfce4"
fi
-
- [[ $INSTALL_WMS != *bspwm* && $INSTALL_WMS != *openbox* ]] && rm -rf "$MNT/home/$NEWUSER/.config/"{jgmenu,tint2}
+ [[ $INSTALL_WMS == *jwm* ]] && sed '7,14d; s/xlock -mode blank/i3-lock-fancy -p/g; s/root:1/rofi_run/g' "$MNT/etc/system.jwmrc" > "$MNT/home/$NEWUSER/.jwmrc"
+ [[ $INSTALL_WMS =~ (bspwm|openbox) ]] || rm -rf "$MNT/home/$NEWUSER/.config/"{jgmenu,tint2}
[[ $USER_PKGS != *geany* ]] && rm -rf "$MNT/home/$NEWUSER/.config/geany"
[[ $MYSHELL != 'bash' ]] && rm -rf "$MNT/home/$NEWUSER/.bash"*
[[ $MYSHELL != 'zsh' ]] && rm -rf "$MNT/home/$NEWUSER/.z"*
sed -i '/super/d; /compton/d' "$MNT/home/$NEWUSER/.xprofile" "$MNT/root/.xprofile"
fi
- # create user home directories (Music, Documents, Downloads, etc..)
- chrun 'xdg-user-dirs-update'
-
return 0
}
ly|sddm|gdm|lightdm)
if [[ $LOGIN_WM == *dwm* ]]; then # dwm doesn't include an xsession file for display managers
mkdir -p "$MNT/usr/share/xsessions"
- cat >"$MNT/usr/share/xsessions/dwm.desktop" <<- EOF
+ cat > "$MNT/usr/share/xsessions/dwm.desktop" <<- EOF
[Desktop Entry]
Encoding=UTF-8
Name=Dwm
EOF
fi
rm -rf "$serv" "$MNT/home/$NEWUSER/.xinitrc"
- chrun "systemctl enable $LOGIN_TYPE.service" 2>$ERR 2>&1
+ chrun "systemctl enable $LOGIN_TYPE.service" 2> "$ERR" 2>&1
errshow 1 "systemctl enable $LOGIN_TYPE.service"
${LOGIN_TYPE}_config
;;
sed -i "s/root/${NEWUSER}/g" $serv/autologin.conf
cat > "$MNT/home/$NEWUSER/$LOGINRC" <<- EOF
# automatically run startx when logging in on tty1
- [ -z "\$DISPLAY" ] && [ \$XDG_VTNR -eq 1 ] && startx
+ [ \$XDG_VTNR -eq 1 ] && exec startx
EOF
else
rm -rf $serv
local rmpkg=""
local inpkg="$PACKAGES $USER_PKGS $AL_BASE_PKGS "
- if pacman -Qq archlabs-installer >/dev/null 2>&1; then
+ if pacman -Qq archlabs-installer > /dev/null 2>&1; then
rmpkg+="archlabs-installer "
fi
rmpkg+="zsh "
fi
- if [[ $INSTALL_WMS == 'dwm' ]]; then # dwm only needs a very limited package set
+ if [[ $INSTALL_WMS =~ (openbox|bspwm|i3-gaps|fluxbox|jwm|awesome) ]]; then
+ inpkg+="$WM_BASE_PKGS "
+ elif [[ $INSTALL_WMS == 'dwm' ]]; then # dwm only needs a very limited package set
inpkg+="nitrogen polkit-gnome gnome-keyring dunst "
- else
- [[ $INSTALL_WMS =~ (plasma|gnome|cinnamon) ]] || inpkg+="archlabs-ksuperkey "
- [[ $INSTALL_WMS =~ (openbox|bspwm|i3-gaps|fluxbox) ]] && inpkg+="$WM_BASE_PKGS "
fi
# update and install crucial packages first to avoid issues
- chrun "pacman -Syyu $KERNEL $BASE_PKGS base-devel ${LOGIN_PKGS[$LOGIN_TYPE]} $MYSHELL --noconfirm --needed" 2>$ERR 2>&1
+ chrun "pacman -Syyu $KERNEL $BASE_PKGS base-devel ${LOGIN_PKGS[$LOGIN_TYPE]} $MYSHELL --noconfirm --needed" 2> "$ERR" 2>&1
errshow 1 "pacman -Syyu $KERNEL $BASE_PKGS base-devel ${LOGIN_PKGS[$LOGIN_TYPE]} $MYSHELL --noconfirm --needed"
# remove the packages we don't want on the installed system
chrun "pacman -S iputils $UCODE --noconfirm"
# install the packages chosen throughout the install
- chrun "pacman -S $inpkg --needed --noconfirm" 2>$ERR 2>&1
+ chrun "pacman -S $inpkg --needed --noconfirm" 2> "$ERR" 2>&1
errshow 1 "pacman -S $inpkg --needed --noconfirm"
# bootloader packages
if [[ $BOOTLDR == 'grub' ]]; then
[[ $SYS == 'UEFI' ]] && local efib="efibootmgr"
- chrun "pacman -S os-prober grub $efib --needed --noconfirm" 2>$ERR 2>&1
+ chrun "pacman -S os-prober grub $efib --needed --noconfirm" 2> "$ERR" 2>&1
errshow 1 "pacman -S os-prober grub $efib --needed --noconfirm"
elif [[ $BOOTLDR == 'refind-efi' ]]; then
- chrun "pacman -S refind-efi efibootmgr --needed --noconfirm" 2>$ERR 2>&1
+ chrun "pacman -S refind-efi efibootmgr --needed --noconfirm" 2> "$ERR" 2>&1
errshow 1 "pacman -S refind-efi efibootmgr --needed --noconfirm"
elif [[ $SYS == 'UEFI' ]]; then
- chrun "pacman -S efibootmgr --needed --noconfirm" 2>$ERR 2>&1
+ chrun "pacman -S efibootmgr --needed --noconfirm" 2> "$ERR" 2>&1
errshow 1 "pacman -S efibootmgr --needed --noconfirm"
fi
+ if [[ $VM ]] && dmesg | grep -qi 'vbox'; then
+ case "$KERNEL" in
+ linux) chrun "pacman -S virtualbox-guest-utils virtualbox-guest-modules-arch --needed --noconfirm" ;;
+ *) chrun "pacman -S virtualbox-guest-utils virtualbox-guest-modules-dkms ${KERNEL}-headers --needed --noconfirm" ;;
+ esac
+ fi
+
# allow members of the wheel group to run commands as root
sed -i "s/# %wheel ALL=(ALL) ALL/%wheel ALL=(ALL) ALL/g" "$MNT/etc/sudoers"
return 0
}
+install_suckless()
+{
+ local dir="$1/suckless"
+ shift
+
+ if [[ $1 == 'chroot' ]]; then
+ chrun "mkdir -pv '$dir'"
+ for i in dwm dmenu st; do
+ if chrun "git clone 'https://git.suckless.org/$i' '$dir/$i'"; then
+ chrun "cd '$dir/$i' && make PREFIX=/usr install"
+ else
+ printf "failed to clone %s repo\n" "$i"
+ fi
+ done
+ else
+ mkdir -pv "$dir"
+ for i in dwm dmenu st; do
+ if git clone "https://git.suckless.org/$i" "$dir/$i"; then
+ cd "$dir/$i" && make PREFIX=/usr install
+ else
+ printf "failed to clone %s repo\n" "$i"
+ fi
+ done
+ fi
+}
+
install_mkinitcpio()
{
local add=''
[[ $LUKS ]] && add="encrypt"
[[ $LVM ]] && { [[ $add ]] && add+=" lvm2" || add+="lvm2"; }
sed -i "s/block filesystems/block ${add} filesystems ${HOOKS}/g" "$MNT/etc/mkinitcpio.conf"
- chrun "mkinitcpio -p $KERNEL" 2>$ERR 2>&1
+ chrun "mkinitcpio -p $KERNEL" 2> "$ERR" 2>&1
errshow 1 "mkinitcpio -p $KERNEL"
}
install_mirrorlist()
{
- if hash reflector >/dev/null 2>&1; then
+ if hash reflector > /dev/null 2>&1; then
reflector --verbose --score 80 -l 40 -f 5 --sort rate --save "$1"
- elif hash rankmirrors >/dev/null 2>&1; then
+ elif hash rankmirrors > /dev/null 2>&1; then
echo "Sorting mirrorlist"
local key="access_key=5f29642060ab983b31fdf4c2935d8c56"
ip_add="$(curl -fsSL "http://api.ipstack.com/check&?$key&fields=ip" | python -c "import sys, json; print(json.load(sys.stdin)['ip'])")"
else # no country code so just grab all mirrors, will be a very slow sort but we don't have other options
mirror="https://www.archlinux.org/mirrorlist/?country=all&use_mirror_status=on"
fi
- curl -fsSL "$mirror" | sed -e 's/^#Server/Server/' -e '/^#/d' | rankmirrors -n 6 - >"$1"
+ curl -fsSL "$mirror" | sed -e 's/^#Server/Server/' -e '/^#/d' | rankmirrors -n 6 - > "$1"
fi
-
- return 0
}
install_background()
{
- ( rsync -a /run/archiso/sfs/airootfs/ "$MNT/" && install_mirrorlist "$MNT/etc/pacman.d/mirrorlist" >/dev/null 2>&1 ) &
+ ( rsync -a /run/archiso/sfs/airootfs/ "$MNT/" && install_mirrorlist "$MNT/etc/pacman.d/mirrorlist" > /dev/null 2>&1 ) &
BG_PID=$!
- trap "kill $BG_PID 2>/dev/null" EXIT
+ trap "kill $BG_PID 2> /dev/null" EXIT
}
-install_suckless()
+install_tearfree_conf()
{
- local dir="$1/suckless"
- shift
+ local xpath="$1"
- if [[ $2 == 'chroot' ]]; then
- chrun "mkdir -pv '$dir'"
- for i in dwm dmenu st; do
- if chrun "git clone 'https://git.suckless.org/$i' '$dir/$i'"; then
- chrun "cd '$dir/$i' && make PREFIX=/usr install"
+ if [[ $VM ]]; then
+ echo "Virtual machine detected, removing xorg configs"
+ find "$xpath/" -name '*.conf' -delete -printf "remove %p\n"
+ elif lspci | grep ' VGA ' | grep -q 'Intel'; then
+ echo "Creating Intel Tear Free config /etc/X11/xorg.conf.d/20-intel.conf"
+ cat > "$xpath/20-intel.conf" <<- EOF
+ Section "Device"
+ Identifier "Intel Graphics"
+ Driver "intel"
+ Option "TearFree" "true"
+ EndSection
+ EOF
+ cat "$xpath/20-intel.conf"
+ elif lspci | grep ' VGA ' | grep -q 'AMD/ATI.*RX\|AMD/ATI.*R[579]'; then # newer RX, R5, R7, and R9 cards can use the amdgpu driver
+ echo "Creating AMD Tear Free config /etc/X11/xorg.conf.d/20-amdgpu.conf"
+ cat > "$xpath/20-amdgpu.conf" <<- EOF
+ Section "Device"
+ Identifier "AMD Graphics"
+ Driver "amdgpu"
+ Option "TearFree" "true"
+ EndSection
+ EOF
+ cat "$xpath/20-amdgpu.conf"
+ elif lspci | grep ' VGA ' | grep -q 'AMD/ATI.*HD [2-6][0-9]*'; then # older HD 2xxx-6xxx cards must use the radeon driver
+ echo "Creating Radeon Tear Free config /etc/X11/xorg.conf.d/20-radeon.conf"
+ cat > "$xpath/20-radeon.conf" <<- EOF
+ Section "Device"
+ Identifier "AMD Graphics"
+ Driver "radeon"
+ Option "TearFree" "on"
+ EndSection
+ EOF
+ cat "$xpath/20-radeon.conf"
+ elif lspci | grep ' VGA ' | grep -q 'NVIDIA'; then # nvidia cards require a bit of checking for notebook gpus
+ echo "Trying nvidia driver install"
+ if lspci | grep ' VGA ' | grep -q 'Intel\|AMD' && lspci | grep ' VGA ' | grep -q 'NVIDIA.*[6-9][1-8][05]M[X]\?\|NVIDIA.*Quadro.*[KMP][1-6][0-2][0]*M'; then # optimus
+ if [[ $xpath == *"$MNT"* ]]; then
+ chrun "nvidia-installer --bumblebee"
else
- printf "failed to clone %s repo\n" "$i"
+ nvidia-installer --bumblebee
fi
- done
- else
- mkdir -pv "$dir"
- for i in dwm dmenu st; do
- if git clone "https://git.suckless.org/$i" "$dir/$i"; then
- cd "$dir/$i" && make PREFIX=/usr install
+ else
+ if [[ $xpath == *"$MNT"* ]]; then
+ chrun "nvidia-installer" # unsure which card so try auto detection
else
- printf "failed to clone %s repo\n" "$i"
+ nvidia-installer
fi
- done
+ fi
+ if [[ -e $xpath/20-nvidia.conf ]]; then
+ cat "$xpath/20-radeon.conf"
+ echo
+ echo "NVIDIA driver installed"
+ if [[ $xpath == *"$MNT"* ]]; then
+ echo "Trying to load the driver for live session"
+ nvidia-smi -r
+ fi
+ echo "To enable driver vsync:"
+ echo -e "\trun nvidia-settings (as root) on first boot\n\tenable 'ForceFullCompositionPipeline' under the advanced settings"
+ echo -e "\tlastly save the change to your nvida xorg config /etc/X11/xorg.conf.d/20-nvidia.conf"
+ echo -e "\tand remove everything but the Device and Screen sections from the file"
+ else
+ echo "Unable to install nvidia driver"
+ fi
+ return 0
fi
+
+ if lspci | grep ' VGA ' | grep -q 'Intel\|AMD/ATI'; then
+ if [[ $xpath == *"$MNT"* ]]; then
+ sed -i 's/xrender/glx/g' "$MNT/etc/skel/.config/compton.conf"
+ else
+ sed -i 's/xrender/glx/g' /etc/skel/.config/compton.conf
+ fi
+ fi
+
+ # remove nvidia installer from installed system when not running nvidia gpu
+ [[ $xpath == *"$MNT"* ]] && rm -rf "$MNT/usr/bin/nvidia-installer" "$MNT/var/lib/nvidia-installer"
}
###############################################################################
# these are called based on which DM is chosen after it is installed
# additional config can be handled here, for now only lightdm has one
+ly_config()
+{
+ : #TODO
+}
+
+gdm_config()
+{
+ : #TODO
+}
+
+sddm_config()
+{
+ : #TODO
+}
+
lightdm_config()
{
cat > "$MNT/etc/lightdm/lightdm-gtk-greeter.conf" <<- EOF
EOF
}
-ly_config()
-{
- :
-}
-
-gdm_config()
-{
- :
-}
-
-sddm_config()
-{
- :
-}
-
###############################################################################
# bootloader setup
# prerun_* set up the configs needed before actually running the commands
[[ $BOOT_DEV ]] || { part_device 1 || return 1; }
BCMDS[grub]="grub-install --recheck --force --target=i386-pc $BOOT_DEV"
else
- BCMDS[grub]="mount -t efivarfs efivarfs /sys/firmware/efi/efivars >/dev/null 2>&1
- grub-install --recheck --force --target=x86_64-efi --efi-directory=/$BOOTDIR --bootloader-id=$DIST"
- grep -q /sys/firmware/efi/efivars /proc/mounts || mount -t efivarfs efivarfs /sys/firmware/efi/efivars >/dev/null 2>&1
+ BCMDS[grub]="mount -t efivarfs efivarfs /sys/firmware/efi/efivars > /dev/null 2>&1
+ grub-install --recheck --force --target=x86_64-efi --efi-directory=/boot --bootloader-id=$DIST"
+ grep -q /sys/firmware/efi/efivars /proc/mounts || mount -t efivarfs efivarfs /sys/firmware/efi/efivars > /dev/null 2>&1
fi
BCMDS[grub]="mkdir -p /run/udev /run/lvm &&
sed -i "s/GRUB_DISTRIBUTOR=.*/GRUB_DISTRIBUTOR=\"${DIST}\"/g; s/GRUB_CMDLINE_LINUX_DEFAULT=.*/GRUB_CMDLINE_LINUX_DEFAULT=\"\"/g" "$MNT/etc/default/grub"
if [[ $LUKS_DEV ]]; then
- sed -i "s~#GRUB_ENABLE_CRYPTODISK~GRUB_ENABLE_CRYPTODISK~g; s~GRUB_CMDLINE_LINUX=.*~GRUB_CMDLINE_LINUX=\"${LUKS_DEV}\"~g" "$MNT/etc/default/grub" 2>$ERR 2>&1
+ sed -i "s~#GRUB_ENABLE_CRYPTODISK~GRUB_ENABLE_CRYPTODISK~g; s~GRUB_CMDLINE_LINUX=.*~GRUB_CMDLINE_LINUX=\"${LUKS_DEV}\"~g" "$MNT/etc/default/grub" 2> "$ERR" 2>&1
errshow 1 "sed -i 's~#GRUB_ENABLE_CRYPTODISK~GRUB_ENABLE_CRYPTODISK~g; s~GRUB_CMDLINE_LINUX=.*~GRUB_CMDLINE_LINUX=\"${LUKS_DEV}\"~g' $MNT/etc/default/grub"
fi
if [[ $SYS == 'BIOS' && $LVM && -z $SEP_BOOT ]]; then
- sed -i "s/GRUB_PRELOAD_MODULES=.*/GRUB_PRELOAD_MODULES=\"lvm\"/g" "$MNT/etc/default/grub" 2>$ERR 2>&1
+ sed -i "s/GRUB_PRELOAD_MODULES=.*/GRUB_PRELOAD_MODULES=\"lvm\"/g" "$MNT/etc/default/grub" 2> "$ERR" 2>&1
errshow 1 "sed -i 's/GRUB_PRELOAD_MODULES=.*/GRUB_PRELOAD_MODULES=\"lvm\"/g' $MNT/etc/default/grub"
fi
prerun_efistub()
{
- BCMDS[systemd-boot]="mount -t efivarfs efivarfs /sys/firmware/efi/efivars >/dev/null 2>&1
+ BCMDS[efistub]="mount -t efivarfs efivarfs /sys/firmware/efi/efivars > /dev/null 2>&1
efibootmgr -v -d $BOOT_DEV -p $BOOT_PART_NUM -c -L '${DIST} Linux' -l /vmlinuz-${KERNEL} \
-u 'root=$ROOT_PART_ID rw $([[ $UCODE ]] && printf 'initrd=\%s.img ' "$UCODE")initrd=\initramfs-${KERNEL}.img'"
}
EDIT_FILES[bootloader]="/boot/syslinux/syslinux.cfg"
else
EDIT_FILES[bootloader]="/boot/EFI/syslinux/syslinux.cfg"
- BCMDS[syslinux]="mount -t efivarfs efivarfs /sys/firmware/efi/efivars >/dev/null 2>&1
+ BCMDS[syslinux]="mount -t efivarfs efivarfs /sys/firmware/efi/efivars > /dev/null 2>&1
efibootmgr -v -c -d $BOOT_DEV -p $BOOT_PART_NUM -l /EFI/syslinux/syslinux.efi -L $DIST"
fi
}
s="/usr/lib/syslinux/efi64"
d='';
fi
- mkdir -pv "$c" 2>$ERR 2>&1
+ mkdir -pv "$c" 2> "$ERR" 2>&1
errshow 1 "mkdir -pv $c"
- cp -rfv "$s/"* "$c/" 2>$ERR 2>&1
+ cp -rfv "$s/"* "$c/" 2> "$ERR" 2>&1
errshow 1 "cp -rfv $s/* $c/"
- cp -fv "$RUN/syslinux/splash.png" "$c/" 2>$ERR 2>&1
+ cp -fv "$RUN/syslinux/splash.png" "$c/" 2> "$ERR" 2>&1
errshow 0 "cp -fv $RUN/syslinux/splash.png $c/"
cat > "$c/syslinux.cfg" <<- EOF
UI vesamenu.c32
setup_refind-efi()
{
EDIT_FILES[bootloader]="/boot/refind_linux.conf"
- BCMDS[refind-efi]="mount -t efivarfs efivarfs /sys/firmware/efi/efivars >/dev/null 2>&1; refind-install"
+ BCMDS[refind-efi]="mount -t efivarfs efivarfs /sys/firmware/efi/efivars > /dev/null 2>&1; refind-install"
}
prerun_refind-efi()
setup_systemd-boot()
{
EDIT_FILES[bootloader]="/boot/loader/entries/$DIST.conf"
- BCMDS[systemd-boot]="mount -t efivarfs efivarfs /sys/firmware/efi/efivars >/dev/null 2>&1; bootctl --path=/boot install"
+ BCMDS[systemd-boot]="mount -t efivarfs efivarfs /sys/firmware/efi/efivars > /dev/null 2>&1; bootctl --path=/boot install"
}
prerun_systemd-boot()
"Back" "Return to the main menu"
case "$choice" in
"$_lvmnew") lvm_create && break ;;
- "$_lvmdel") lvm_delgroup && yesno "$_lvmdel" "$_lvmdelask" && vgremove -f "$DEL_VG" >/dev/null 2>&1 ;;
+ "$_lvmdel") lvm_delgroup && yesno "$_lvmdel" "$_lvmdelask" && vgremove -f "$DEL_VG" > /dev/null 2>&1 ;;
"$_lvmdelall") lvm_del_all ;;
*) break ;;
esac
lvm_detect()
{
- local v pv
- pv="$(pvs -o pv_name --noheading 2>/dev/null)"
- v="$(lvs -o vg_name,lv_name --noheading --separator - 2>/dev/null)"
- VGROUP="$(vgs -o vg_name --noheading 2>/dev/null)"
-
- if [[ $VGROUP && $v && $pv ]]; then
- msg "LVM Setup" "\nActivating existing logical volume management.\n" 0
- modprobe dm-mod >/dev/null 2>$ERR
- errshow 'modprobe dm-mod'
- vgscan >/dev/null 2>&1
- vgchange -ay >/dev/null 2>&1
+ if [[ $(vgs -o vg_name --noheading 2> /dev/null) ]]; then
+ if [[ $(lvs -o vg_name,lv_name --noheading --separator - 2> /dev/null) && $(pvs -o pv_name --noheading 2> /dev/null) ]]; then
+ msg "LVM Setup" "\nActivating existing logical volume management.\n" 0
+ modprobe dm-mod > /dev/null 2> "$ERR"
+ errshow 0 'modprobe dm-mod'
+ vgscan > /dev/null 2>&1
+ vgchange -ay > /dev/null 2>&1
+ fi
fi
}
lvm_extra_lvs || return 1
lvm_volume_name "$_lvmlvname\nNOTE: This LV will use up all remaining space in the volume group (${VGROUP_MB}MB)" || return 1
msg "$_lvmnew (LV:$VOL_COUNT)" "\nCreating volume $VNAME from remaining space in $VGROUP\n" 0
- lvcreate -l +100%FREE "$VGROUP" -n "$VNAME" >/dev/null 2>$ERR
- errshow "lvcreate -l +100%FREE $VGROUP -n $VNAME" || return 1
+ lvcreate -l +100%FREE "$VGROUP" -n "$VNAME" > /dev/null 2> "$ERR"
+ errshow 0 "lvcreate -l +100%FREE $VGROUP -n $VNAME" || return 1
LVM='logical volume'; sleep 0.5
txt="\nDone, volume: $VGROUP-$VNAME (${VOLUME_SIZE:-${VGROUP_MB}MB}) has been created.\n"
msg "$_lvmnew (LV:$VOL_COUNT)" "$txt\n$(lsblk -o NAME,MODEL,TYPE,FSTYPE,SIZE $LVM_PARTS)\n"
done
msg "$_lvmnew" "\nCreating volume group: $VGROUP\n" 0
- vgcreate -f "$VGROUP" $LVM_PARTS >/dev/null 2>$ERR
- errshow "vgcreate -f $VGROUP $LVM_PARTS" || return 1
+ vgcreate -f "$VGROUP" $LVM_PARTS > /dev/null 2> "$ERR"
+ errshow 0 "vgcreate -f $VGROUP $LVM_PARTS" || return 1
SIZE=$(vgdisplay "$VGROUP" | awk '/VG Size/ { gsub(/[^0-9.]/, ""); print int($0) }')
SIZE_UNIT="$(vgdisplay "$VGROUP" | awk '/VG Size/ { print substr($NF, 0, 1) }')"
lvm_del_all()
{
local v pv
- pv="$(pvs -o pv_name --noheading 2>/dev/null)"
- v="$(lvs -o vg_name,lv_name --noheading --separator - 2>/dev/null)"
- VGROUP="$(vgs -o vg_name --noheading 2>/dev/null)"
+ pv="$(pvs -o pv_name --noheading 2> /dev/null)"
+ v="$(lvs -o vg_name,lv_name --noheading --separator - 2> /dev/null)"
+ VGROUP="$(vgs -o vg_name --noheading 2> /dev/null)"
if [[ $VGROUP || $v || $pv ]]; then
if yesno "$_lvmdelall" "$_lvmdelask"; then
- for i in $v; do lvremove -f "/dev/mapper/$i" >/dev/null 2>&1; done
- for i in $VGROUP; do vgremove -f "$i" >/dev/null 2>&1; done
- for i in $pv; do pvremove -f "$i" >/dev/null 2>&1; done
+ for i in $v; do lvremove -f "/dev/mapper/$i" > /dev/null 2>&1; done
+ for i in $VGROUP; do vgremove -f "$i" > /dev/null 2>&1; done
+ for i in $pv; do pvremove -f "$i" > /dev/null 2>&1; done
LVM=''
fi
else
while (( VOL_COUNT > 1 )); do
lvm_volume_name "$_lvmlvname" && lvm_lv_size || return 1
msg "$_lvmnew (LV:$VOL_COUNT)" "\nCreating a $VOLUME_SIZE volume $VNAME in $VGROUP\n" 0
- lvcreate -L "$VOLUME_SIZE" "$VGROUP" -n "$VNAME" >/dev/null 2>$ERR
- errshow "lvcreate -L $VOLUME_SIZE $VGROUP -n $VNAME" || return 1
+ lvcreate -L "$VOLUME_SIZE" "$VGROUP" -n "$VNAME" > /dev/null 2> "$ERR"
+ errshow 0 "lvcreate -L $VOLUME_SIZE $VGROUP -n $VNAME" || return 1
msg "$_lvmnew (LV:$VOL_COUNT)" "\nDone, logical volume (LV) $VNAME ($VOLUME_SIZE) has been created.\n"
(( VOL_COUNT-- ))
done
luks_open()
{
- modprobe -a dm-mod dm_crypt >/dev/null 2>&1
+ modprobe -a dm-mod dm_crypt > /dev/null 2>&1
umount_dir "$MNT"
part_find 'part|crypt|lvm' || return 1
luks_pass "$_luksopen" || return 1
msg "$_luksopen" "\nOpening encrypted partition: $LUKS_NAME\n\nUsing device/volume: $LUKS_PART\n" 0
- cryptsetup open --type luks "$LUKS_PART" "$LUKS_NAME" <<< "$LUKS_PASS" 2>$ERR
- errshow "cryptsetup open --type luks $LUKS_PART $LUKS_NAME" || return 1
+ cryptsetup open --type luks "$LUKS_PART" "$LUKS_NAME" <<< "$LUKS_PASS" 2> "$ERR"
+ errshow 0 "cryptsetup open --type luks $LUKS_PART $LUKS_NAME" || return 1
LUKS='encrypted'; luks_show
return 0
}
dialog --insecure --backtitle "$DIST Installer - $SYS - v$VER" --separator $'\n' --title " $t " --mixedform "$_luksomenu" 0 0 0 \
"Name:" 1 1 "${ans[0]}" 1 7 "$COLUMNS" 0 0 \
"Password:" 2 1 '' 2 11 "$COLUMNS" 0 1 \
- "Password2:" 3 1 '' 3 12 "$COLUMNS" 0 1 2>"$ANS" || return 1
+ "Password2:" 3 1 '' 3 12 "$COLUMNS" 0 1 2> "$ANS" || return 1
mapfile -t ans <"$ANS"
luks_setup()
{
- modprobe -a dm-mod dm_crypt >/dev/null 2>&1
+ modprobe -a dm-mod dm_crypt > /dev/null 2>&1
umount_dir "$MNT"
part_find 'part|lvm' || return 1
{
luks_setup || return 1
msg "$_luksnew" "\nCreating encrypted partition: $LUKS_NAME\n\nDevice or volume used: $LUKS_PART\n" 0
- cryptsetup -q luksFormat "$LUKS_PART" <<< "$LUKS_PASS" 2>$ERR
- errshow "cryptsetup -q luksFormat $LUKS_PART" || return 1
- cryptsetup open "$LUKS_PART" "$LUKS_NAME" <<< "$LUKS_PASS" 2>$ERR
- errshow "cryptsetup open $LUKS_PART $LUKS_NAME" || return 1
+ cryptsetup -q luksFormat "$LUKS_PART" <<< "$LUKS_PASS" 2> "$ERR"
+ errshow 0 "cryptsetup -q luksFormat $LUKS_PART" || return 1
+ cryptsetup open "$LUKS_PART" "$LUKS_NAME" <<< "$LUKS_PASS" 2> "$ERR"
+ errshow 0 "cryptsetup open $LUKS_PART $LUKS_NAME" || return 1
LUKS='encrypted'; luks_show
return 0
}
dlg cipher input "LUKS Encryption" "$_lukskey" "-s 512 -c aes-xts-plain64"
[[ $cipher ]] || return 1
msg "$_luksadv" "\nCreating encrypted partition: $LUKS_NAME\n\nDevice or volume used: $LUKS_PART\n" 0
- cryptsetup -q $cipher luksFormat "$LUKS_PART" <<< "$LUKS_PASS" 2>$ERR
- errshow "cryptsetup -q $cipher luksFormat $LUKS_PART" || return 1
- cryptsetup open "$LUKS_PART" "$LUKS_NAME" <<< "$LUKS_PASS" 2>$ERR
- errshow "cryptsetup open $LUKS_PART $LUKS_NAME" || return 1
+ cryptsetup -q $cipher luksFormat "$LUKS_PART" <<< "$LUKS_PASS" 2> "$ERR"
+ errshow 0 "cryptsetup -q $cipher luksFormat $LUKS_PART" || return 1
+ cryptsetup open "$LUKS_PART" "$LUKS_NAME" <<< "$LUKS_PASS" 2> "$ERR"
+ errshow 0 "cryptsetup open $LUKS_PART $LUKS_NAME" || return 1
luks_show
return 0
fi
tput cnorm
if [[ -d $MNT ]]; then
umount_dir "$MNT"
- if (( e == 127 )); then
- umount_dir /run/archiso/bootmnt && sleep 0.5 && reboot -f
- fi
+ (( e == 127 )) && umount_dir /run/archiso/bootmnt && sleep 0.5 && reboot -f
fi
exit $e
}
tput civis
case "$dlg_t" in
- menu) dialog --backtitle "$DIST Installer - $SYS - v$VER" --title " $title " --menu "$body" 0 0 $n "$@" 2>"$ANS" || return 1 ;;
- check) dialog --backtitle "$DIST Installer - $SYS - v$VER" --title " $title " --checklist "$body" 0 0 $n "$@" 2>"$ANS" || return 1 ;;
+ menu) dialog --backtitle "$DIST Installer - $SYS - v$VER" --title " $title " --menu "$body" 0 0 $n "$@" 2> "$ANS" || return 1 ;;
+ check) dialog --backtitle "$DIST Installer - $SYS - v$VER" --title " $title " --checklist "$body" 0 0 $n "$@" 2> "$ANS" || return 1 ;;
input)
tput cnorm
local def="$1" # assign default value for input
shift
if [[ $1 == 'limit' ]]; then
- dialog --backtitle "$DIST Installer - $SYS - v$VER" --max-input 63 --title " $title " --inputbox "$body" 0 0 "$def" 2>"$ANS" || return 1
+ dialog --backtitle "$DIST Installer - $SYS - v$VER" --max-input 63 --title " $title " --inputbox "$body" 0 0 "$def" 2> "$ANS" || return 1
else
- dialog --backtitle "$DIST Installer - $SYS - v$VER" --title " $title " --inputbox "$body" 0 0 "$def" 2>"$ANS" || return 1
+ dialog --backtitle "$DIST Installer - $SYS - v$VER" --title " $title " --inputbox "$body" 0 0 "$def" 2> "$ANS" || return 1
fi
;;
esac
clear
die 0
elif ! net_connect; then
- msg "Not Connected" "\nRunning live requires an active internet connection.\n\nExiting..\n" 2
+ msg "Not Connected" "\nRunning live requires an active internet connection to install packages.\n\nExiting..\n" 2
die 1
elif (( $(awk '/MemTotal/ {print int($2 / 1024)}' /proc/meminfo) < 2500)); then
- msg "Not Enough Memory" "\nRunning live requires at least 2.5G of system memory.\n\nExiting..\n" 2
+ msg "Not Enough Memory" "\nLive session requires at least 2.5G of system memory for installing packages.\n\nExiting..\n" 2
die 1
- else
- clear
- echo "Sorting mirrorlist first"
- mount /run/archiso/cowspace -o remount,size=2G
- install_mirrorlist "/etc/pacman.d/mirrorlist"
- pacman -Syyu --noconfirm || die 1
- pacman -S $BASE_PKGS $AL_BASE_PKGS xorg-xinit --needed --noconfirm || die 1
- case "$ses" in
- i3-gaps|openbox|fluxbox|bspwm|awesome) pacman -S "$ses" $WM_BASE_PKGS ${WM_EXT[$ses]} --needed --noconfirm || die 1 ;;
- gnome|plasma|cinnamon|xfce4) pacman -S "$ses" ${WM_EXT[$ses]} --needed --noconfirm || die 1 ;;
- dwm) { pacman -S git --needed --noconfirm || die 1; }; install_suckless "/root" nochroot ;;
- esac
- pamixer --unmute
- gtk-update-icon-cache /usr/share/icons/ArchLabs-Dark /usr/share/icons/ArchLabs-Light /usr/share/icons/ArchLabs
- pacman -Scc --noconfirm
- rm -rf "/var/cache/pacman/pkg/"*
- cp -rfT /etc/skel /root || die 1
- sed -i "/exec/ c exec ${WM_SESSIONS[$ses]}" /root/.xinitrc
- printf "\n%s has been set as the login session in ~/.xinitrc, to start the session simply run\n\n\tstartx\n\n" "${WM_SESSIONS[$ses]}"
- die 0
fi
+
+ clear
+ echo "Sorting mirrorlist"
+ mount /run/archiso/cowspace -o remount,size=2G
+ install_mirrorlist "/etc/pacman.d/mirrorlist"
+ pacman -Syyu --noconfirm || die 1
+ rm -rf /var/cache/pacman/pkg/*
+ pacman -S $BASE_PKGS $AL_BASE_PKGS xorg-xinit --needed --noconfirm || die 1
+ rm -rf /var/cache/pacman/pkg/*
+ case "$ses" in
+ i3-gaps|openbox|fluxbox|bspwm|awesome|xfce4|jwm) pacman -S "$ses" $WM_BASE_PKGS ${WM_EXT[$ses]} --needed --noconfirm || die 1 ;;
+ gnome|plasma|cinnamon) pacman -S "$ses" ${WM_EXT[$ses]} --needed --noconfirm || die 1 ;;
+ dwm) { pacman -S git --needed --noconfirm || die 1; }; install_suckless "/root" nochroot ;;
+ esac
+ rm -rf /var/cache/pacman/pkg/*
+ [[ $VM ]] && dmesg | grep -qi 'vbox' && pacman -S virtualbox-guest-utils virtualbox-guest-modules-arch --needed --noconfirm
+ pacman -Scc --noconfirm
+ rm -rf /var/cache/pacman/pkg/*
+ cp -rfT /etc/skel /root
+ [[ $TEARFREE ]] && install_tearfree_conf "/etc/X11/xorg.conf.d"
+ case "$ses" in
+ plasma|gnome|cinnamon) sed -i '/super/d; /nitrogen/d; /compton/d' /root/.xprofile ;;
+ dwm) sed -i '/super/d; /compton/d' /root/.xprofile ;;
+ esac
+ rm -f /root/.zlogin
+ echo -e "pulseaudio &\n(sleep 1; pamixer --unmute --set-volume 50) &" >> /root/.xprofile
+ sed -i "/exec/ c exec ${WM_SESSIONS[$ses]}" /root/.xinitrc
+ printf "\n%s has been set as the login session in ~/.xinitrc, to start the session simply run\n\n\tstartx\n\n" "${WM_SESSIONS[$ses]}"
+ die 0
}
usage()
{
- cat <<-EOF
+ cat <<- EOF
usage: $1 [-hdl] [session]
options:
- -h, --help print this message and exit
- -l, --live install and setup a live session
- -d, --debug enable xtrace and log output to $DBG
+ -h, --help print this message and exit
+ -l, --live install and setup a live session
+ -d, --debug enable xtrace and log output to $DBG
+ -t, --tearfree install and setup drivers for nvidia or tearfree xorg configs for other vendors
+ if you experience boot issues with this option you can remove
+ /etc/X11/xorg.conf.d/20-*.conf
sessions:
- i3-gaps - A fork of i3wm with more features including gaps
- openbox - A lightweight, powerful, and highly configurable stacking wm
- dwm - A dynamic WM for X that manages windows in tiled, floating, or monocle layouts
- awesome - A customized Awesome WM session created by @elanapan
- bspwm - A tiling wm that represents windows as the leaves of a binary tree
- fluxbox - A lightweight and highly-configurable window manager
- gnome - A desktop environment that aims to be simple and easy to use
- cinnamon - A desktop environment combining traditional desktop with modern effects
- plasma - A kde software project currently comprising a full desktop environment
- xfce4 - A lightweight and modular desktop environment based on gtk+2/3
+ i3-gaps - A fork of i3wm with more features including gaps
+ openbox - A lightweight, powerful, and highly configurable stacking wm
+ dwm - A dynamic WM for X that manages windows in tiled, floating, or monocle layouts
+ awesome - A customized Awesome WM session created by @elanapan
+ bspwm - A tiling wm that represents windows as the leaves of a binary tree
+ fluxbox - A lightweight and highly-configurable window manager
+ gnome - A desktop environment that aims to be simple and easy to use
+ cinnamon - A desktop environment combining traditional desktop with modern effects
+ plasma - A kde software project currently comprising a full desktop environment
+ xfce4 - A lightweight and modular desktop environment based on gtk+2/3
distro name:
- set the DIST environment variable before launching the installer eg.
+ set the DIST environment variable before launching the installer eg.
+
+ DIST='MyDistro' $1
- DIST='MyDistro' $1
+ root/boot partition:
+
+ set the ROOT_PART and/or BOOT_PART environment variables before launching the installer eg.
+
+ ROOT_PART='/dev/sda2' BOOT_PART='/dev/sda1' $1
editor used:
- set the EDITOR environment variable before launching the installer eg.
+ set the EDITOR environment variable before launching the installer eg.
- EDITOR='nano' $1
+ EDITOR='nano' $1
EOF
exit 0
{
[ $? -eq 0 ] && return 0
- local fatal=0 err=""
+ local fatal=$1
+ shift # always shift off the fatal level arg
+
+ local err=""
err="$(sed 's/[^[:print:]]//g; s/\[[0-9\;:]*\?m//g; s/==> //g; s/] ERROR:/]\nERROR:/g' "$ERR")"
[[ -z $err ]] && err="no error message was found"
- (( $1 == 1 )) && { fatal=1; shift; }
-
local txt="\nCommand: $1\n\n\n\nError: $err\n\n"
if (( fatal )); then
mount | grep -q 'swap' && swapoff -a
for dir; do
if [[ -d $dir ]] && mount | grep -q "on $dir "; then
- if ! umount "$dir" 2>/dev/null; then
+ if ! umount "$dir" 2> /dev/null; then
sleep 0.5
- umount -f "$dir" 2>/dev/null || umount -l "$dir"
+ umount -f "$dir" 2> /dev/null || umount -l "$dir"
fi
fi
done
{
if chk_connect; then
return 0
- elif hash nmtui >/dev/null 2>&1; then
+ elif hash nmtui > /dev/null 2>&1; then
tput civis
if [[ $TERM == 'linux' ]]; then
printf "%b" "\e]P1191919" "\e]P4191919"
nmtui-connect
fi
chk_connect
- elif hash wifi-menu >dev/null 2>&1; then
+ elif hash wifi-menu > /dev/null 2>&1; then
wifi-menu
chk_connect
else
UCODE="intel-ucode"
fi
- modprobe -q efivarfs >/dev/null 2>&1
+ modprobe -q efivarfs > /dev/null 2>&1
- _prep="\nOnce a step is finished a step you will be returned here, if the step was successful the cursor will be advanced to the next step.\nIf a step is unsuccessful the cursor will be placed on the step required to advance (when possible).\n\nTo begin the install you should have:\n\n - A root (/) partition mounted."
if [[ -d /sys/firmware/efi/efivars ]]; then
export SYS="UEFI"
grep -q /sys/firmware/efi/efivars /proc/mounts || mount -t efivarfs efivarfs /sys/firmware/efi/efivars
- _prep+="\n - An EFI boot partition mounted."
else
export SYS="BIOS"
fi
- _prep+="\n\nOnce finished mounting, a portion of the install can be done in the background while you continue configuring the system:\n"
- _prep+="\n - Choose the system bootloader.\n - Create a user and password."
- _prep+="\n - Basic system configuration, kernel, shell, login, packages, etc..\n\nOnce you're happy with the choices and the required steps are complete, the main install can be started."
}
###############################################################################
elif ! grep -qwm 1 'lm' /proc/cpuinfo; then
msg "Not x86_64 Architecture" "\nThis installer only supports x86_64 architectures.\n\nExiting..\n" 2
die 1
-else
- case "$1" in
- -d|--debug) debug ;;
- -h|--help) usage "$0" ;;
- -l|--live)
- case "$2" in
- gnome|cinnamon|dwm|plasma|xfce4|i3-gaps|openbox|fluxbox|bspwm|awesome) live "$2" ;;
- *) echo "error: invalid session for -l, --live, see -h, --help"; die 1 ;;
- esac ;;
- esac
fi
# trap ^C to perform cleanup
trap 'printf "\n^C\n" && die 1' INT
+while getopts ":htl:d" OPT; do
+ case "$OPT" in
+ d) debug ;;
+ h) usage "$0" ;;
+ t) TEARFREE=true ;;
+ l)
+ if [[ "${!WM_SESSIONS[@]}" =~ $OPTARG ]]; then
+ live "$OPTARG"
+ else
+ echo "error: invalid session for -l, see -h for help"; die 1
+ fi
+ ;;
+ \?) echo "error: invalid option: -$OPTARG"; die 1 ;;
+ esac
+done
+
system_identify
system_devices
msg "Not Connected" "\nThis installer requires an active internet connection.\n\nExiting..\n" 2
die 1
fi
-EXMNTS=""
-FORMATTED=""
while :; do
main
OSDN Git Service
