Merge pull request #26 from ChrisTitusTech/test

Bug Fixes ArchTitus 1.1 Release
This commit is contained in:
Chris Titus 2021-10-25 00:29:55 -05:00 committed by GitHub
commit 4b6ad793e5
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 42 additions and 62 deletions

View File

@ -7,7 +7,7 @@
# ██║ ██║██║ ██║╚██████╗██║ ██║ ██║ ██║ ██║ ╚██████╔╝███████║ # ██║ ██║██║ ██║╚██████╗██║ ██║ ██║ ██║ ██║ ╚██████╔╝███████║
# ╚═╝ ╚═╝╚═╝ ╚═╝ ╚═════╝╚═╝ ╚═╝ ╚═╝ ╚═╝ ╚═╝ ╚═════╝ ╚══════╝ # ╚═╝ ╚═╝╚═╝ ╚═╝ ╚═════╝╚═╝ ╚═╝ ╚═╝ ╚═╝ ╚═╝ ╚═════╝ ╚══════╝
#------------------------------------------------------------------------- #-------------------------------------------------------------------------
SCRIPT_DIR="$( cd -- "$( dirname -- "${BASH_SOURCE[0]}" )" &> /dev/null && pwd )"
echo "-------------------------------------------------" echo "-------------------------------------------------"
echo "Setting up mirrors for optimal download " echo "Setting up mirrors for optimal download "
echo "-------------------------------------------------" echo "-------------------------------------------------"
@ -26,6 +26,9 @@ echo -e " ██╔══██║██╔══██╗██║ ██
echo -e " ██║ ██║██║ ██║╚██████╗██║ ██║ ██║ ██║ ██║ ╚██████╔╝███████║" echo -e " ██║ ██║██║ ██║╚██████╗██║ ██║ ██║ ██║ ██║ ╚██████╔╝███████║"
echo -e " ╚═╝ ╚═╝╚═╝ ╚═╝ ╚═════╝╚═╝ ╚═╝ ╚═╝ ╚═╝ ╚═╝ ╚═════╝ ╚══════╝" echo -e " ╚═╝ ╚═╝╚═╝ ╚═╝ ╚═════╝╚═╝ ╚═╝ ╚═╝ ╚═╝ ╚═╝ ╚═════╝ ╚══════╝"
echo -e "-------------------------------------------------------------------------" echo -e "-------------------------------------------------------------------------"
echo -e "-Setting up $iso mirrors for faster downloads"
echo -e "-------------------------------------------------------------------------"
reflector -a 48 -c $iso -f 5 -l 20 --sort rate --save /etc/pacman.d/mirrorlist reflector -a 48 -c $iso -f 5 -l 20 --sort rate --save /etc/pacman.d/mirrorlist
mkdir /mnt mkdir /mnt
@ -80,6 +83,12 @@ ls /mnt | xargs btrfs subvolume delete
btrfs subvolume create /mnt/@ btrfs subvolume create /mnt/@
umount /mnt umount /mnt
;; ;;
*)
echo "Rebooting in 3 Seconds ..." && sleep 1
echo "Rebooting in 2 Seconds ..." && sleep 1
echo "Rebooting in 1 Second ..." && sleep 1
reboot now
;;
esac esac
# mount target # mount target
@ -88,6 +97,14 @@ mkdir /mnt/boot
mkdir /mnt/boot/efi mkdir /mnt/boot/efi
mount -t vfat -L UEFISYS /mnt/boot/ mount -t vfat -L UEFISYS /mnt/boot/
if ! grep -qs '/mnt' /proc/mounts; then
echo "Drive is not mounted can not continue"
echo "Rebooting in 3 Seconds ..." && sleep 1
echo "Rebooting in 2 Seconds ..." && sleep 1
echo "Rebooting in 1 Second ..." && sleep 1
reboot now
fi
echo "--------------------------------------" echo "--------------------------------------"
echo "-- Arch Install on Main Drive --" echo "-- Arch Install on Main Drive --"
echo "--------------------------------------" echo "--------------------------------------"
@ -105,8 +122,18 @@ linux /vmlinuz-linux
initrd /initramfs-linux.img initrd /initramfs-linux.img
options root=LABEL=ROOT rw rootflags=subvol=@ options root=LABEL=ROOT rw rootflags=subvol=@
EOF EOF
cp -R ~/ArchTitus /mnt/root/ cp -R ${SCRIPT_DIR} /mnt/root/ArchTitus
cp /etc/pacman.d/mirrorlist /mnt/etc/pacman.d/mirrorlist cp /etc/pacman.d/mirrorlist /mnt/etc/pacman.d/mirrorlist
echo "--------------------------------------" echo "--------------------------------------"
echo "-- Check for low memory systems <8G --"
echo "--------------------------------------"
TOTALMEM=$(cat /proc/meminfo | grep -i 'memtotal' | grep -o '[[:digit:]]*')
if [[ $TOTALMEM -lt 8000000 ]]; then
dd if=/dev/zero of=/swapfile bs=1M count=2048 status=progress
chmod 600 /swapfile
mkswap /swapfile
swapon /swapfile
fi
echo "--------------------------------------"
echo "-- SYSTEM READY FOR 0-setup --" echo "-- SYSTEM READY FOR 0-setup --"
echo "--------------------------------------" echo "--------------------------------------"

View File

@ -53,6 +53,15 @@ pacman -Sy --noconfirm
echo -e "\nInstalling Base System\n" echo -e "\nInstalling Base System\n"
PKGS=( PKGS=(
'mesa' # Essential Xorg First
'xorg'
'xorg-server'
'xorg-apps'
'xorg-drivers'
'xorg-xkill'
'xorg-xinit'
'xterm'
'plasma-desktop' # KDE Load second
'alsa-plugins' # audio plugins 'alsa-plugins' # audio plugins
'alsa-utils' # audio utils 'alsa-utils' # audio utils
'ark' # compression 'ark' # compression
@ -76,15 +85,10 @@ PKGS=(
'code' # Visual Studio code 'code' # Visual Studio code
'cronie' 'cronie'
'cups' 'cups'
'dhcpcd'
'dialog' 'dialog'
'discover' 'discover'
'dmidecode'
'dnsmasq'
'dolphin' 'dolphin'
'dosfstools' 'dosfstools'
'drkonqi'
'edk2-ovmf'
'efibootmgr' # EFI boot 'efibootmgr' # EFI boot
'egl-wayland' 'egl-wayland'
'exfat-utils' 'exfat-utils'
@ -98,7 +102,6 @@ PKGS=(
'git' 'git'
'gparted' # partition management 'gparted' # partition management
'gptfdisk' 'gptfdisk'
'groff'
'grub' 'grub'
'grub-customizer' 'grub-customizer'
'gst-libav' 'gst-libav'
@ -108,45 +111,12 @@ PKGS=(
'htop' 'htop'
'iptables-nft' 'iptables-nft'
'jdk-openjdk' # Java 17 'jdk-openjdk' # Java 17
'kactivitymanagerd'
'kate' 'kate'
'kvantum-qt5' 'kvantum-qt5'
'kcalc'
'kcharselect'
'kcron'
'kde-cli-tools'
'kde-gtk-config' 'kde-gtk-config'
'kdecoration'
'kdenetwork-filesharing'
'kdeplasma-addons'
'kdesdk-thumbnailers'
'kdialog'
'keychain'
'kfind'
'kgamma5'
'kgpg'
'khotkeys'
'kinfocenter'
'kitty' 'kitty'
'kmenuedit'
'kmix'
'konsole' 'konsole'
'kscreen'
'kscreenlocker'
'ksshaskpass'
'ksystemlog'
'ksystemstats'
'kwallet-pam'
'kwalletmanager'
'kwayland-integration'
'kwayland-server'
'kwin'
'kwrite'
'kwrited'
'layer-shell-qt' 'layer-shell-qt'
'libguestfs'
'libkscreen'
'libksysguard'
'libnewt' 'libnewt'
'libtool' 'libtool'
'linux' 'linux'
@ -172,21 +142,6 @@ PKGS=(
'patch' 'patch'
'picom' 'picom'
'pkgconf' 'pkgconf'
'plasma-browser-integration'
'plasma-desktop'
'plasma-disks'
'plasma-firewall'
'plasma-integration'
'plasma-nm'
'plasma-pa'
'plasma-sdk'
'plasma-systemmonitor'
'plasma-thunderbolt'
'plasma-vault'
'plasma-workspace'
'plasma-workspace-wallpapers'
'polkit-kde-agent'
'powerdevil'
'powerline-fonts' 'powerline-fonts'
'print-manager' 'print-manager'
'pulseaudio' 'pulseaudio'
@ -205,13 +160,11 @@ PKGS=(
'synergy' 'synergy'
'systemsettings' 'systemsettings'
'terminus-font' 'terminus-font'
'texinfo'
'traceroute' 'traceroute'
'ufw' 'ufw'
'unrar' 'unrar'
'unzip' 'unzip'
'usbutils' 'usbutils'
'vde2'
'vim' 'vim'
'virt-manager' 'virt-manager'
'virt-viewer' 'virt-viewer'
@ -222,9 +175,6 @@ PKGS=(
'winetricks' 'winetricks'
'xdg-desktop-portal-kde' 'xdg-desktop-portal-kde'
'xdg-user-dirs' 'xdg-user-dirs'
'xorg'
'xorg-server'
'xorg-xinit'
'zeroconf-ioslave' 'zeroconf-ioslave'
'zip' 'zip'
'zsh' 'zsh'
@ -275,6 +225,8 @@ then
passwd $username passwd $username
cp -R /root/ArchTitus /home/$username/ cp -R /root/ArchTitus /home/$username/
chown -R $username: /home/$username/ArchTitus chown -R $username: /home/$username/ArchTitus
read -p "Please name your machine:" nameofmachine
echo $nameofmachine > /etc/hostname
else else
echo "You are already a user proceed with aur installs" echo "You are already a user proceed with aur installs"
fi fi

View File

@ -25,7 +25,7 @@ EOF
# ------------------------------------------------------------------------ # ------------------------------------------------------------------------
echo -e "\nEnabling the cups service daemon so we can print" echo -e "\nEnabling essential services"
systemctl enable cups.service systemctl enable cups.service
sudo ntpd -qg sudo ntpd -qg
@ -33,6 +33,7 @@ sudo systemctl enable ntpd.service
sudo systemctl disable dhcpcd.service sudo systemctl disable dhcpcd.service
sudo systemctl stop dhcpcd.service sudo systemctl stop dhcpcd.service
sudo systemctl enable NetworkManager.service sudo systemctl enable NetworkManager.service
sudo systemctl enable bluetooth
echo " echo "
############################################################################### ###############################################################################
# Cleaning # Cleaning