fixed error in 3-post-setup.sh spacing in if-statement
added minor indentation added code description with `echo`
This commit is contained in:
parent
d733f961b3
commit
96b668a6e5
|
|
@ -123,6 +123,12 @@ elif grep -E "Integrated Graphics Controller" <<< ${gpu_type}; then
|
|||
elif grep -E "Intel Corporation UHD" <<< ${gpu_type}; then
|
||||
pacman -S --needed --noconfirm libva-intel-driver libvdpau-va-gl lib32-vulkan-intel vulkan-intel libva-intel-driver libva-utils lib32-mesa
|
||||
fi
|
||||
|
||||
echo -ne "
|
||||
-------------------------------------------------------------------------
|
||||
Set username, password, hostname
|
||||
-------------------------------------------------------------------------
|
||||
"
|
||||
#SETUP IS WRONG THIS IS RUN
|
||||
if ! source $HOME/ArchTitus/configs/setup.conf; then
|
||||
# Loop through user input until the user gives a valid username
|
||||
|
|
@ -137,12 +143,12 @@ if ! source $HOME/ArchTitus/configs/setup.conf; then
|
|||
fi
|
||||
echo "Incorrect username."
|
||||
done
|
||||
# convert name to lowercase before saving to setup.conf
|
||||
echo "username=${username,,}" >> ${HOME}/ArchTitus/configs/setup.conf
|
||||
# convert name to lowercase before saving to setup.conf
|
||||
echo "username=${username,,}" >> ${HOME}/ArchTitus/configs/setup.conf
|
||||
|
||||
#Set Password
|
||||
read -p "Please enter password:" password
|
||||
echo "password=${password,,}" >> ${HOME}/ArchTitus/configs/setup.conf
|
||||
echo "password=${password,,}" >> ${HOME}/ArchTitus/configs/setup.conf
|
||||
|
||||
# Loop through user input until the user gives a valid hostname, but allow the user to force save
|
||||
while true
|
||||
|
|
|
|||
|
|
@ -15,8 +15,6 @@ echo -ne "
|
|||
Automated Arch Linux Installer
|
||||
SCRIPTHOME: ArchTitus
|
||||
-------------------------------------------------------------------------
|
||||
|
||||
Installing AUR Softwares
|
||||
"
|
||||
source $HOME/ArchTitus/configs/setup.conf
|
||||
|
||||
|
|
@ -27,6 +25,11 @@ source $HOME/ArchTitus/configs/setup.conf
|
|||
git clone --depth=1 https://github.com/romkatv/powerlevel10k.git ~/powerlevel10k
|
||||
ln -s "~/zsh/.zshrc" ~/.zshrc
|
||||
|
||||
echo -ne "
|
||||
-------------------------------------------------------------------------
|
||||
Install Desktop Environment
|
||||
-------------------------------------------------------------------------
|
||||
"
|
||||
sed -n '/'$INSTALL_TYPE'/q;p' ~/ArchTitus/pkg-files/${DESKTOP_ENV}.txt | while read line
|
||||
do
|
||||
if [[ ${line} == '--END OF MINIMAL INSTALL--' ]]
|
||||
|
|
@ -38,12 +41,19 @@ do
|
|||
sudo pacman -S --noconfirm --needed ${line}
|
||||
done
|
||||
|
||||
|
||||
echo -ne "
|
||||
-------------------------------------------------------------------------
|
||||
Install AUR Software
|
||||
-------------------------------------------------------------------------
|
||||
"
|
||||
if [[ ! $AUR_HELPER == none ]]; then
|
||||
cd ~
|
||||
git clone "https://aur.archlinux.org/$AUR_HELPER.git"
|
||||
cd ~/$AUR_HELPER
|
||||
makepkg -si --noconfirm
|
||||
cd ~
|
||||
rm -rf $AUR_HELPER
|
||||
|
||||
# sed $INSTALL_TYPE is using install type to check for MINIMAL installation, if it's true, stop
|
||||
# stop the script and move on, not installing any more packages below that line
|
||||
sed -n '/'$INSTALL_TYPE'/q;p' ~/ArchTitus/pkg-files/aur-pkgs.txt | while read line
|
||||
|
|
@ -59,7 +69,11 @@ fi
|
|||
|
||||
export PATH=$PATH:~/.local/bin
|
||||
|
||||
# Theming DE if user chose FULL installation
|
||||
echo -ne "
|
||||
-------------------------------------------------------------------------
|
||||
Theming DE if user chose FULL installation
|
||||
-------------------------------------------------------------------------
|
||||
"
|
||||
if [[ $INSTALL_TYPE == "FULL" ]]; then
|
||||
if [[ $DESKTOP_ENV == "kde" ]]; then
|
||||
cp -r ~/ArchTitus/configs/.config/* ~/.config/
|
||||
|
|
|
|||
|
|
@ -136,7 +136,7 @@ PLYMOUTH_THEME="arch-glow" # can grab from config later if we allow selection
|
|||
mkdir -p /usr/share/plymouth/themes
|
||||
echo 'Installing Plymouth theme...'
|
||||
cp -rf ${PLYMOUTH_THEMES_DIR}/${PLYMOUTH_THEME} /usr/share/plymouth/themes
|
||||
if [[ $FS == "luks"]]; then
|
||||
if [[ $FS == "luks" ]]; then
|
||||
sed -i 's/HOOKS=(base udev*/& plymouth/' /etc/mkinitcpio.conf # add plymouth after base udev
|
||||
sed -i 's/HOOKS=(base udev \(.*block\) /&plymouth-/' /etc/mkinitcpio.conf # create plymouth-encrypt after block hook
|
||||
else
|
||||
|
|
|
|||
Loading…
Reference in New Issue