Fix Script Setup file

This commit is contained in:
Chris Titus 2022-01-06 13:10:11 -06:00
parent 15bfaa8514
commit 5733122a1f
4 changed files with 7 additions and 5 deletions

View File

@ -110,7 +110,7 @@ elif grep -E "Intel Corporation UHD" <<< ${gpu_type}; then
pacman -S libva-intel-driver libvdpau-va-gl lib32-vulkan-intel vulkan-intel libva-intel-driver libva-utils lib32-mesa --needed --noconfirm
fi
#SETUP IS WRONG THIS IS RUN
if ! source setup.conf; then
if ! source /root/ArchTitus/setup.conf; then
# Loop through user input until the user gives a valid username
while true
do

View File

@ -15,7 +15,7 @@ echo -ne "
Installing AUR Softwares
"
# You can solve users running this script as root with this and then doing the same for the next for statement. However I will leave this up to you.
source ~/ArchTitus/setup.conf
source $HOME/ArchTitus/setup.conf
cd ~
git clone "https://aur.archlinux.org/yay.git"

View File

@ -1,7 +1,8 @@
#!/bin/bash
# Find the name of the folder the scripts are in
export SCRIPTHOME="$(basename -- $PWD)"
SCRIPT_DIR="$( cd -- "$( dirname -- "${BASH_SOURCE[0]}" )" &> /dev/null && pwd )"
echo -ne "
-------------------------------------------------------------------------
█████╗ ██████╗ ██████╗██╗ ██╗████████╗██╗████████╗██╗ ██╗███████╗
@ -16,7 +17,7 @@ echo -ne "
Scripts are in directory named ArchTitus
"
bash startup.sh
source setup.conf
source $SCRIPT_DIR/setup.conf
bash 0-preinstall.sh
arch-chroot /mnt /root/ArchTitus/1-setup.sh
arch-chroot /mnt /usr/bin/runuser -u $username -- /home/$username/ArchTitus/2-user.sh

View File

@ -3,8 +3,9 @@
# like disk, file system, timezone, keyboard layout,
# user name, password, etc.
SCRIPT_DIR="$( cd -- "$( dirname -- "${BASH_SOURCE[0]}" )" &> /dev/null && pwd )"
# set up a config file
CONFIG_FILE=setup.conf
CONFIG_FILE=$SCRIPT_DIR/setup.conf
if [ ! -f $CONFIG_FILE ]; then # check if file exists
touch -f $CONFIG_FILE # create file if not exists
fi