diff --git a/archsetup.sh b/archsetup.sh index fbbd130..d5ecffe 100755 --- a/archsetup.sh +++ b/archsetup.sh @@ -87,7 +87,6 @@ echo "systemctl enable ufw" # Setup Printer echo "systemctl enable cups" -echo "systemctl start cups" # Setup Yay while true;do diff --git a/start-setup.sh b/start-setup.sh index 7bcecc1..2e5dc69 100755 --- a/start-setup.sh +++ b/start-setup.sh @@ -16,18 +16,6 @@ if [[ ! -d /home/$(whoami)/Repos ]]; then echo "mkdir /home/$(whoami)/Repos" fi -# Check for git -if [[ ! -f /bin/git ]]; then - echo "Authentication Is Required. Enter $username's password" - echo "sudo pacman -S --noconfirm --needed git" - echo "" -fi - -if [[ ! -d /home/$(whoami)/Repos/arch-automated-installer ]]; then - echo "git clone https://gitea.barcelli.net/rodolfo/arch-automated-installer /home/$(whoami)/Repos/arch-automated-installer" - echo "cd /home/$(whoami)/Repos/arch-automated-installer" -fi - script_PATH=$(pwd) if [[ -d /etc/apt ]]; then @@ -48,6 +36,17 @@ elif [[ -d /etc/pacman ]]; then read -p "Are you using a Arch? (y/n)" answer echo "${answer,,}" if [[ "${answer,,}" == "y" ]]; then + # Check for git + if [[ ! -f /bin/git ]]; then + echo "Authentication Is Required. Enter $username's password" + echo "sudo pacman -S --noconfirm --needed git" + echo "" + fi + # Get the Repo + if [[ ! -d /home/$(whoami)/Repos/arch-automated-installer ]]; then + echo "git clone https://gitea.barcelli.net/rodolfo/arch-automated-installer /home/$(whoami)/Repos/arch-automated-installer" + echo "cd /home/$(whoami)/Repos/arch-automated-installer" + fi echo "bash script_PATH/archsetup.sh" break elif [[ "${answer,,}" == "n" ]]; then