refactor: resolve indentation issues

This commit is contained in:
Javier Ruiz Ramos 2024-08-07 15:56:47 +02:00
parent d8cb82681d
commit b1ae1d234e
29 changed files with 559 additions and 569 deletions

View File

@ -2,7 +2,7 @@
# 💫 https://github.com/JaKooLit 💫 #
# main dependencies #
# packages neeeded
# packages needed
dependencies=(
build-essential
cmake

View File

@ -10,7 +10,7 @@ Extra=(
)
# packages neeeded
# packages needed
hypr_package=(
cliphist
grim

View File

@ -19,7 +19,6 @@ ORANGE=$(tput setaf 166)
YELLOW=$(tput setaf 3)
RESET=$(tput sgr0)
# Function for installing packages
install_package() {
# Checking if package is already installed

View File

@ -1,4 +1,4 @@
7#!/bin/bash
#!/bin/bash
# 💫 https://github.com/JaKooLit 💫 #
# Aylur's GTK Shell #
@ -41,11 +41,10 @@ for PKG1 in "${ags[@]}"; do
fi
done
#install typescript by npm
# Install typescript by npm
sudo npm install --global typescript 2>&1 | tee -a "$LOG"
# ags
printf "${NOTE} Install and Compiling Aylurs GTK shell\n"
# Check if folder exists and remove it
@ -75,3 +74,4 @@ else
exit 1
fi
clear

View File

@ -24,7 +24,10 @@ LOG="Install-Logs/install-$(date +%d-%H%M%S)_bluetooth.log"
printf "${NOTE} Installing Bluetooth Packages...\n"
for BLUE in "${blue[@]}"; do
install_package "$BLUE" 2>&1 | tee -a "$LOG"
[ $? -ne 0 ] && { echo -e "\e[1A\e[K${ERROR} - $BLUE Package installation failed, Please check the installation logs"; exit 1; }
if [ $? -ne 0 ]; then
echo -e "\e[1A\e[K${ERROR} - $BLUE Package installation failed, Please check the installation logs"
exit 1
fi
done
printf " Activating Bluetooth Services...\n"

View File

@ -2,7 +2,7 @@
# 💫 https://github.com/JaKooLit 💫 #
# Cliphist install using go #
## This is to be be use for Ubuntu 23.10 only
## This is to be be used for Ubuntu 23.10 only
# it is disabled by default. Enable it on install.sh #execute_script "cliphist.sh"
## WARNING: DO NOT EDIT BEYOND THIS LINE IF YOU DON'T KNOW WHAT YOU ARE DOING! ##
@ -23,7 +23,7 @@ printf "\n%s - Installing cliphist using go.... \n" "${NOTE}"
export PATH=$PATH:/usr/local/bin
go install go.senan.xyz/cliphist@latest 2>&1 | tee -a "$LOG"
# copy cliphist into /usr/local/bin for some reason it is installing in ~/go/bin
# Copy cliphist into /usr/local/bin for some reason it is installing in ~/go/bin
sudo cp -r "$HOME/go/bin/cliphist" "/usr/local/bin/" 2>&1 | tee -a "$LOG"
clear

View File

@ -20,8 +20,7 @@ source "$(dirname "$(readlink -f "$0")")/Global_functions.sh"
# Set the name of the log file to include the current date and time
LOG="Install-Logs/install-$(date +%d-%H%M%S)_themes.log"
# installing engine needed for gtk themes
# Installing engine needed for GTK themes
for PKG1 in "${engine[@]}"; do
install_package "$PKG1" 2>&1 | tee -a "$LOG"
if [ $? -ne 0 ]; then

View File

@ -1,6 +1,6 @@
#!/bin/bash
# 💫 https://github.com/JaKooLit 💫 #
# This is to be use for installing hyprland plugins
# This is to be used for installing hyprland plugins
# Hyprland plugins: pyprland
pypr_depend=(
@ -25,10 +25,12 @@ LOG="Install-Logs/install-$(date +%d-%H%M%S)_hypr_eco.log"
printf "${NOTE} Installing Pyprland Dependencies...\n"
for PYPR in "${pypr_depend[@]}"; do
install_package "$PYPR" 2>&1 | tee -a "$LOG"
[ $? -ne 0 ] && { echo -e "\e[1A\e[K${ERROR} - $PYPR Package installation failed, Please check the installation logs"; exit 1; }
if [ $? -ne 0 ]; then
echo -e "\e[1A\e[K${ERROR} - $PYPR Package installation failed, Please check the installation logs"
exit 1
fi
done
# Check if the file exists and delete it
pypr="/usr/local/bin/pypr"
if [ -f "$pypr" ]; then

View File

@ -43,22 +43,20 @@ fi
# Clone and build
printf "${NOTE} Installing hyprcursor...\n"
if git clone --recursive -b $cursor_tag https://github.com/hyprwm/hyprcursor.git; then
if git clone --recursive -b "$cursor_tag" https://github.com/hyprwm/hyprcursor.git; then
cd hyprcursor || exit 1
cmake --no-warn-unused-cli -DCMAKE_BUILD_TYPE:STRING=Release -DCMAKE_INSTALL_PREFIX:PATH=/usr -S . -B ./build
cmake --build ./build --config Release --target all -j`nproc 2>/dev/null || getconf NPROCESSORS_CONF`
cmake --build ./build --config Release --target all -j"$(nproc 2>/dev/null || getconf NPROCESSORS_CONF)"
if sudo cmake --install ./build 2>&1 | tee -a "$MLOG"; then
printf "${OK} hyprcursor installed successfully.\n" 2>&1 | tee -a "$MLOG"
else
echo -e "${ERROR} Installation failed for hyprcursor." 2>&1 | tee -a "$MLOG"
fi
#moving the addional logs to Install-Logs directory
mv $MLOG ../Install-Logs/ || true
# moving the additional logs to Install-Logs directory
mv "$MLOG" ../Install-Logs/ || true
cd ..
else
echo -e "${ERROR} Download failed for hyprcursor." 2>&1 | tee -a "$LOG"
fi
clear

View File

@ -1,6 +1,6 @@
#!/bin/bash
# 💫 https://github.com/JaKooLit 💫 #
# hypidle #
# hypridle #
idle=(
libsdbus-c++-dev
@ -42,22 +42,20 @@ fi
# Clone and build
printf "${NOTE} Installing hypridle...\n"
if git clone --recursive -b $idle_tag https://github.com/hyprwm/hypridle.git; then
if git clone --recursive -b "$idle_tag" https://github.com/hyprwm/hypridle.git; then
cd hypridle || exit 1
cmake --no-warn-unused-cli -DCMAKE_BUILD_TYPE:STRING=Release -S . -B ./build
cmake --build ./build --config Release --target hypridle -j`nproc 2>/dev/null || getconf NPROCESSORS_CONF`
cmake --build ./build --config Release --target hypridle -j"$(nproc 2>/dev/null || getconf NPROCESSORS_CONF)"
if sudo cmake --install ./build 2>&1 | tee -a "$MLOG"; then
printf "${OK} hypridle installed successfully.\n" 2>&1 | tee -a "$MLOG"
else
echo -e "${ERROR} Installation failed for hypridle." 2>&1 | tee -a "$MLOG"
fi
#moving the addional logs to Install-Logs directory
mv $MLOG ../Install-Logs/ || true
# Moving the additional logs to Install-Logs directory
mv "$MLOG" ../Install-Logs/ || true
cd ..
else
echo -e "${ERROR} Download failed for hypridle." 2>&1 | tee -a "$LOG"
fi
clear

View File

@ -2,7 +2,6 @@
# 💫 https://github.com/JaKooLit 💫 #
# Main Hyprland Package#
# specific branch or release
hyprland_tag="v0.39.1"
@ -29,7 +28,7 @@ if [ -d "Hyprland" ]; then
rm -rf "Hyprland" 2>&1 | tee -a "$LOG"
fi
if git clone --recursive -b $hyprland_tag "https://github.com/hyprwm/Hyprland"; then
if git clone --recursive -b "$hyprland_tag" "https://github.com/hyprwm/Hyprland"; then
cd "Hyprland" || exit 1
make all
if sudo make install 2>&1 | tee -a "$MLOG"; then
@ -37,7 +36,7 @@ if git clone --recursive -b $hyprland_tag "https://github.com/hyprwm/Hyprland";
else
echo -e "${ERROR} Installation failed for Hyprland." 2>&1 | tee -a "$MLOG"
fi
mv $MLOG ../Install-Logs/ || true
mv "$MLOG" ../Install-Logs/ || true
cd ..
else
echo -e "${ERROR} Download failed for Hyprland." 2>&1 | tee -a "$LOG"
@ -48,4 +47,3 @@ wayland_sessions_dir=/usr/share/wayland-sessions
sudo cp assets/hyprland.desktop "$wayland_sessions_dir/" 2>&1 | tee -a "$LOG"
clear

View File

@ -30,22 +30,20 @@ fi
# Clone and build hyprlang
printf "${NOTE} Installing hyprlang...\n"
if git clone --recursive -b $lang_tag https://github.com/hyprwm/hyprlang.git; then
if git clone --recursive -b "$lang_tag" https://github.com/hyprwm/hyprlang.git; then
cd hyprlang || exit 1
cmake --no-warn-unused-cli -DCMAKE_BUILD_TYPE:STRING=Release -DCMAKE_INSTALL_PREFIX:PATH=/usr -S . -B ./build
cmake --build ./build --config Release --target hyprlang -j`nproc 2>/dev/null || getconf NPROCESSORS_CONF`
cmake --build ./build --config Release --target hyprlang -j"$(nproc 2>/dev/null || getconf NPROCESSORS_CONF)"
if sudo cmake --install ./build 2>&1 | tee -a "$MLOG"; then
printf "${OK} hyprlang installed successfully.\n" 2>&1 | tee -a "$MLOG"
else
echo -e "${ERROR} Installation failed for hyprlang." 2>&1 | tee -a "$MLOG"
fi
#moving the addional logs to Install-Logs directory
mv $MLOG ../Install-Logs/ || true
# Moving the additional logs to Install-Logs directory
mv "$MLOG" ../Install-Logs/ || true
cd ..
else
echo -e "${ERROR} Download failed for hyprlang." 2>&1 | tee -a "$LOG"
fi
clear

View File

@ -34,7 +34,7 @@ for PKG1 in "${lock[@]}"; do
fi
done
# Check if hyprlidle folder exists and remove it
# Check if hyprlock folder exists and remove it
if [ -d "hyprlock" ]; then
printf "${NOTE} Removing existing hyprlock folder...\n"
rm -rf "hyprlock"
@ -42,21 +42,20 @@ fi
# Clone and build hyprlock
printf "${NOTE} Installing hyprlock...\n"
if git clone --recursive -b $lock_tag https://github.com/hyprwm/hyprlock.git; then
if git clone --recursive -b "$lock_tag" https://github.com/hyprwm/hyprlock.git; then
cd hyprlock || exit 1
cmake --no-warn-unused-cli -DCMAKE_BUILD_TYPE:STRING=Release -S . -B ./build
cmake --build ./build --config Release --target hyprlock -j`nproc 2>/dev/null || getconf _NPROCESSORS_CONF`
cmake --build ./build --config Release --target hyprlock -j"$(nproc 2>/dev/null || getconf _NPROCESSORS_CONF)"
if sudo cmake --install build 2>&1 | tee -a "$MLOG"; then
printf "${OK} hyprlock installed successfully.\n" 2>&1 | tee -a "$MLOG"
else
echo -e "${ERROR} Installation failed for hyprlock." 2>&1 | tee -a "$MLOG"
fi
#moving the addional logs to Install-Logs directory
mv $MLOG ../Install-Logs/ || true
# Moving the additional logs to Install-Logs directory
mv "$MLOG" ../Install-Logs/ || true
cd ..
else
echo -e "${ERROR} Download failed for hyprlock." 2>&1 | tee -a "$LOG"
fi
clear

View File

@ -6,7 +6,6 @@ depend=(
build-essential
)
## 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 )"
@ -21,7 +20,7 @@ source "$(dirname "$(readlink -f "$0")")/Global_functions.sh"
LOG="Install-Logs/install-$(date +%d-%H%M%S)_image.log"
MLOG="install-$(date +%d-%H%M%S)_image.log"
# Installing depencies
# Installing dependencies
for PKG1 in "${depend[@]}"; do
install_package "$PKG1" 2>&1 | tee -a "$LOG"
if [ $? -ne 0 ]; then
@ -30,7 +29,6 @@ for PKG1 in "${depend[@]}"; do
fi
done
##
printf "${NOTE} Installing ImageMagick from source...\n"
# Check if folder exists and remove it
@ -51,8 +49,8 @@ if git clone --depth 1 https://github.com/ImageMagick/ImageMagick.git; then
else
echo -e "${ERROR} Installation failed for ImageMagick." 2>&1 | tee -a "$MLOG"
fi
#moving the addional logs to Install-Logs directory
mv $MLOG ../Install-Logs/ || true
# Moving the additional logs to Install-Logs directory
mv "$MLOG" ../Install-Logs/ || true
cd ..
else
echo -e "${ERROR} Download failed for ImageMagick." 2>&1 | tee -a "$LOG"

View File

@ -57,8 +57,7 @@ printf "${YELLOW} Installing Nvidia packages...\n"
install_package "$NVIDIA" 2>&1 | tee -a "$LOG"
done
printf "${YELLOW} nvidia-stuff to /etc/default/grub..."
printf "${YELLOW} nvidia-stuff to /etc/default/grub...\n"
# Additional options to add to GRUB_CMDLINE_LINUX
additional_options="rd.driver.blacklist=nouveau modprobe.blacklist=nouveau nvidia-drm.modeset=1 rcutree.rcu_idle_gp_delay=1"

View File

@ -1,6 +1,6 @@
#!/bin/bash
# 💫 https://github.com/JaKooLit 💫 #
# nwg-look ) #
# nwg-look #
nwg_look=(
golang

View File

@ -1,6 +1,6 @@
#!/bin/bash
# 💫 https://github.com/JaKooLit 💫 #
# Rofi-Wayland) #
# Rofi-Wayland #
rofi=(
bison
@ -28,7 +28,7 @@ source "$(dirname "$(readlink -f "$0")")/Global_functions.sh"
LOG="Install-Logs/install-$(date +%d-%H%M%S)_rofi_wayland.log"
MLOG="install-$(date +%d-%H%M%S)_rofi_wayland2.log"
# uninstall other rofi
# Uninstall other rofi
for PKG in "rofi" "bison"; do
uninstall_package "$PKG" 2>&1 | tee -a "$LOG"
if [ $? -ne 0 ]; then
@ -59,7 +59,7 @@ if [ -d "rofi" ]; then
rm -rf rofi
fi
# cloning rofi-wayland
# Cloning rofi-wayland
printf "${NOTE} Cloning rofi-wayland repository...\n"
if git clone https://github.com/lbonn/rofi.git; then
cd rofi || exit 1

View File

@ -1,6 +1,6 @@
#!/bin/bash
# 💫 https://github.com/JaKooLit 💫 #
# ASUS ROG ) #
# ASUS ROG #
asus=(
power-profiles-daemon
@ -22,7 +22,7 @@ source $HOME/.cargo/env
# Set the name of the log file to include the current date and time
LOG="install-$(date +%d-%H%M%S)_rog.log"
# Installing enhancemet
# Installing enhancement
for PKG1 in "${asus[@]}"; do
install_package "$PKG1" 2>&1 | tee -a "$LOG"
if [ $? -ne 0 ]; then
@ -56,8 +56,8 @@ install_and_log() {
echo -e "${ERROR} Installation failed for $project_name."
fi
#moving logs into main install-logs
mv $LOG ../Install-Logs/ || true
# Moving logs into main install-logs
mv "$LOG" ../Install-Logs/ || true
cd - || exit 1
else
echo -e "${ERROR} Cloning $project_name from $git_url failed."

View File

@ -28,7 +28,6 @@ source "$(dirname "$(readlink -f "$0")")/Global_functions.sh"
# Set the name of the log file to include the current date and time
LOG="Install-Logs/install-$(date +%d-%H%M%S)_sddm.log"
# Install SDDM (no-recommends)
printf "\n%s - Installing sddm.... \n" "${NOTE}"
for PKG1 in "${sddm1[@]}" ; do

View File

@ -60,8 +60,8 @@ if git clone --depth 1 https://github.com/jtheoof/swappy.git; then
else
echo -e "${ERROR} Installation failed for swappy." 2>&1 | tee -a "$MLOG"
fi
#moving the addional logs to Install-Logs directory
mv $MLOG ../Install-Logs/ || true
# Moving the additional logs to Install-Logs directory
mv "$MLOG" ../Install-Logs/ || true
cd ..
else
echo -e "${ERROR} Download failed for swappy." 2>&1 | tee -a "$LOG"

View File

@ -1,6 +1,6 @@
#!/bin/bash
# 💫 https://github.com/JaKooLit 💫 #
# wallust - pywal colors replacment #
# wallust - pywal colors replacement #
depend=(
librust-jpeg-decoder-dev
@ -23,7 +23,7 @@ source "$(dirname "$(readlink -f "$0")")/Global_functions.sh"
LOG="Install-Logs/install-$(date +%d-%H%M%S)_wallust.log"
MLOG="install-$(date +%d-%H%M%S)_wallust.log"
# Installing depencies
# Installing dependencies
for PKG1 in "${depend[@]}"; do
install_package "$PKG1" 2>&1 | tee -a "$LOG"
if [ $? -ne 0 ]; then
@ -32,7 +32,6 @@ for PKG1 in "${depend[@]}"; do
fi
done
##
printf "${NOTE} Installing wallust from dev branch...\n"
# Check if folder exists and remove it
@ -43,7 +42,7 @@ fi
# Clone and build wallust
printf "${NOTE} Installing wallust...\n"
if git clone --depth 1 -b $wal_tag https://codeberg.org/explosion-mental/wallust.git; then
if git clone --depth 1 -b "$wal_tag" https://codeberg.org/explosion-mental/wallust.git; then
cd wallust || exit 1
make
if sudo make install 2>&1 | tee -a "$MLOG"; then
@ -51,12 +50,11 @@ if git clone --depth 1 -b $wal_tag https://codeberg.org/explosion-mental/wallust
else
echo -e "${ERROR} Installation failed for wallust." 2>&1 | tee -a "$MLOG"
fi
#moving the addional logs to Install-Logs directory
mv $MLOG ../Install-Logs/ || true
# Moving the additional logs to Install-Logs directory
mv "$MLOG" ../Install-Logs/ || true
cd ..
else
echo -e "${ERROR} Download failed for wallust." 2>&1 | tee -a "$LOG"
fi
clear

View File

@ -24,7 +24,10 @@ MLOG="install-$(date +%d-%H%M%S)_xdph2.log"
printf "${NOTE} Installing xdg-desktop-portal-gtk...\n"
for portal in "${xdg[@]}"; do
install_package "$portal" 2>&1 | tee -a "$LOG"
[ $? -ne 0 ] && { echo -e "\e[1A\e[K${ERROR} - $portal Package installation failed, Please check the installation logs"; exit 1; }
if [ $? -ne 0 ]; then
echo -e "\e[1A\e[K${ERROR} - $portal Package installation failed, Please check the installation logs"
exit 1
fi
done
# Check if xdg-desktop-portal-hyprland folder exists and remove it
@ -43,8 +46,8 @@ if git clone --branch v1.3.0 --recursive https://github.com/hyprwm/xdg-desktop-p
else
echo -e "${ERROR} Installation failed for xdg-desktop-portal-hyprland." 2>&1 | tee -a "$MLOG"
fi
#moving the addional logs to Install-Logs directory
mv $MLOG ../Install-Logs/ || true
# Moving the additional logs to Install-Logs directory
mv "$MLOG" ../Install-Logs/ || true
cd ..
else
echo -e "${ERROR} Download failed for xdg-desktop-portal-hyprland." 2>&1 | tee -a "$LOG"
@ -77,10 +80,9 @@ while true; do
break
;;
[Nn])
echo "no other XDG-implementations will be removed." 2>&1 | tee -a "$LOG"
echo "No other XDG-implementations will be removed." 2>&1 | tee -a "$LOG"
break
;;
*)
echo "Invalid input. Please enter 'y' for yes or 'n' for no."
;;
@ -88,4 +90,3 @@ while true; do
done
clear

View File

@ -113,6 +113,7 @@ ask_custom_option() {
fi
done
}
# Function to execute a script if it exists and make it executable
execute_script() {
local script="$1"
@ -174,7 +175,6 @@ execute_script "hypridle.sh"
execute_script "hyprland.sh"
execute_script "hypr-eco.sh"
# execute_script "cliphist.sh"
if [ "$nvidia" == "Y" ]; then
@ -212,6 +212,7 @@ fi
if [ "$rog" == "Y" ]; then
execute_script "rog.sh"
fi
# re-install rofi-wayland
execute_script "rofi-wayland.sh"
execute_script "InputGroup.sh"