diff --git a/install-scripts/00-base.sh b/install-scripts/00-base.sh index 8a7baa6..7659ece 100755 --- a/install-scripts/00-base.sh +++ b/install-scripts/00-base.sh @@ -6,20 +6,10 @@ base=( base-devel ) ## WARNING: DO NOT EDIT BEYOND THIS LINE IF YOU DON'T KNOW WHAT YOU ARE DOING! ## - -# Determine the directory where the script is located -SCRIPT_DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )" - -# Change the working directory to the parent directory of the script -PARENT_DIR="$SCRIPT_DIR/.." -cd "$PARENT_DIR" || exit 1 - # Set the name of the log file to include the current date and time LOG="Install-Logs/install-$(date +%d-%H%M%S)_base.log" - set -e - # Set some colors for output messages OK="$(tput setaf 2)[OK]$(tput sgr0)" ERROR="$(tput setaf 1)[ERROR]$(tput sgr0)" diff --git a/install-scripts/00-hypr-pkgs.sh b/install-scripts/00-hypr-pkgs.sh index 6f269f9..7cc818f 100755 --- a/install-scripts/00-hypr-pkgs.sh +++ b/install-scripts/00-hypr-pkgs.sh @@ -84,12 +84,6 @@ uninstall=( ) ## WARNING: DO NOT EDIT BEYOND THIS LINE IF YOU DON'T KNOW WHAT YOU ARE DOING! ## -# Determine the directory where the script is located -SCRIPT_DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )" - -# Change the working directory to the parent directory of the script -PARENT_DIR="$SCRIPT_DIR/.." -cd "$PARENT_DIR" || exit 1 # Set the name of the log file to include the current date and time LOG="Install-Logs/install-$(date +%d-%H%M%S)_hypr-pkgs.log" diff --git a/install-scripts/bluetooth.sh b/install-scripts/bluetooth.sh index 0f1a9ec..945b68c 100755 --- a/install-scripts/bluetooth.sh +++ b/install-scripts/bluetooth.sh @@ -9,13 +9,6 @@ blueman ) ## WARNING: DO NOT EDIT BEYOND THIS LINE IF YOU DON'T KNOW WHAT YOU ARE DOING! ## -# Determine the directory where the script is located -SCRIPT_DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )" - -# Change the working directory to the parent directory of the script -PARENT_DIR="$SCRIPT_DIR/.." -cd "$PARENT_DIR" || exit 1 - # Set the name of the log file to include the current date and time LOG="Install-Logs/install-$(date +%d-%H%M%S)_bluetooth.log" diff --git a/install-scripts/dotfiles.sh b/install-scripts/dotfiles.sh index 531aae4..e9893ae 100755 --- a/install-scripts/dotfiles.sh +++ b/install-scripts/dotfiles.sh @@ -4,8 +4,6 @@ ## WARNING: DO NOT EDIT BEYOND THIS LINE IF YOU DON'T KNOW WHAT YOU ARE DOING! ## -set -e - # Set some colors for output messages OK="$(tput setaf 2)[OK]$(tput sgr0)" ERROR="$(tput setaf 1)[ERROR]$(tput sgr0)" diff --git a/install-scripts/hyprland.sh b/install-scripts/hyprland.sh index 687d7c5..789f87f 100755 --- a/install-scripts/hyprland.sh +++ b/install-scripts/hyprland.sh @@ -7,14 +7,6 @@ hyprland ) ## WARNING: DO NOT EDIT BEYOND THIS LINE IF YOU DON'T KNOW WHAT YOU ARE DOING! ## - -# Determine the directory where the script is located -SCRIPT_DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )" - -# Change the working directory to the parent directory of the script -PARENT_DIR="$SCRIPT_DIR/.." -cd "$PARENT_DIR" || exit 1 - # Set the name of the log file to include the current date and time LOG="Install-Logs/install-$(date +%d-%H%M%S)_hyprland.log" diff --git a/install-scripts/nvidia.sh b/install-scripts/nvidia.sh index 7bb44e0..323d99a 100755 --- a/install-scripts/nvidia.sh +++ b/install-scripts/nvidia.sh @@ -15,13 +15,6 @@ hypr=( ) ## WARNING: DO NOT EDIT BEYOND THIS LINE IF YOU DON'T KNOW WHAT YOU ARE DOING! ## -# Determine the directory where the script is located -SCRIPT_DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )" - -# Change the working directory to the parent directory of the script -PARENT_DIR="$SCRIPT_DIR/.." -cd "$PARENT_DIR" || exit 1 - # Set the name of the log file to include the current date and time LOG="Install-Logs/install-$(date +%d-%H%M%S)_nvidia.log" diff --git a/install-scripts/paru.sh b/install-scripts/paru.sh index b0dccd0..93f9925 100755 --- a/install-scripts/paru.sh +++ b/install-scripts/paru.sh @@ -5,13 +5,6 @@ ## WARNING: DO NOT EDIT BEYOND THIS LINE IF YOU DON'T KNOW WHAT YOU ARE DOING! ## -# Determine the directory where the script is located -SCRIPT_DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )" - -# Change the working directory to the parent directory of the script -PARENT_DIR="$SCRIPT_DIR/.." -cd "$PARENT_DIR" || exit 1 - # Set the name of the log file to include the current date and time LOG="Install-Logs/install-$(date +%d-%H%M%S)_paru.log" diff --git a/install-scripts/pipewire.sh b/install-scripts/pipewire.sh index 918c246..0150216 100755 --- a/install-scripts/pipewire.sh +++ b/install-scripts/pipewire.sh @@ -11,14 +11,6 @@ pipewire=( ) ############## WARNING: DO NOT EDIT BEYOND THIS LINE IF YOU DON'T KNOW WHAT YOU ARE DOING! ############## -# Set some colors for output messages -# Determine the directory where the script is located -SCRIPT_DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )" - -# Change the working directory to the parent directory of the script -PARENT_DIR="$SCRIPT_DIR/.." -cd "$PARENT_DIR" || exit 1 - # Set the name of the log file to include the current date and time LOG="Install-Logs/install-$(date +%d-%H%M%S)_pipewire.log" diff --git a/install-scripts/xdph.sh b/install-scripts/xdph.sh index e139a64..1a3ba86 100755 --- a/install-scripts/xdph.sh +++ b/install-scripts/xdph.sh @@ -8,14 +8,6 @@ xdg-desktop-portal-gtk ) ## WARNING: DO NOT EDIT BEYOND THIS LINE IF YOU DON'T KNOW WHAT YOU ARE DOING! ## - -# Determine the directory where the script is located -SCRIPT_DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )" - -# Change the working directory to the parent directory of the script -PARENT_DIR="$SCRIPT_DIR/.." -cd "$PARENT_DIR" || exit 1 - set -e # Set some colors for output messages diff --git a/install-scripts/yay.sh b/install-scripts/yay.sh index 222f25d..17671c0 100755 --- a/install-scripts/yay.sh +++ b/install-scripts/yay.sh @@ -5,13 +5,6 @@ ## WARNING: DO NOT EDIT BEYOND THIS LINE IF YOU DON'T KNOW WHAT YOU ARE DOING! ## -# Determine the directory where the script is located -SCRIPT_DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )" - -# Change the working directory to the parent directory of the script -PARENT_DIR="$SCRIPT_DIR/.." -cd "$PARENT_DIR" || exit 1 - # Set the name of the log file to include the current date and time LOG="Install-Logs/install-$(date +%d-%H%M%S)_yay.log" diff --git a/install.sh b/install.sh index 43acbde..fded281 100755 --- a/install.sh +++ b/install.sh @@ -31,8 +31,6 @@ if [ "$proceed" != "y" ]; then exit 1 fi -source install-scripts/Global_functions.sh - # Create Directory for Install Logs if [ ! -d Install-Logs ]; then mkdir Install-Logs