mirror of
https://github.com/JaKooLit/Debian-Hyprland.git
synced 2025-12-21 02:10:13 +01:00
Fixes for install.sh file wrong names and update other files to conform with Shellcheck
This commit is contained in:
parent
6ef8bbb6e1
commit
a8ddf21d4e
@ -37,14 +37,14 @@ printf "\n%.0s" {1..1}
|
||||
|
||||
if [ -d "$Distro_DIR" ]; then
|
||||
echo "${YELLOW}$Distro_DIR exists. Updating the repository... ${RESET}"
|
||||
cd "$Distro_DIR"
|
||||
cd "$Distro_DIR" || exit 1
|
||||
git stash && git pull
|
||||
chmod +x install.sh
|
||||
./install.sh
|
||||
else
|
||||
echo "${MAGENTA}$Distro_DIR does not exist. Cloning the repository...${RESET}"
|
||||
git clone --depth=1 "$Github_URL" "$Distro_DIR"
|
||||
cd "$Distro_DIR"
|
||||
cd "$Distro_DIR" || exit 1
|
||||
chmod +x install.sh
|
||||
./install.sh
|
||||
fi
|
||||
@ -138,6 +138,6 @@ curl --proto '=https' --tlsv1.2 -sSf https://sh.rustup.rs | sh -s -- -y 2>&1 | t
|
||||
source "$HOME/.cargo/env"
|
||||
|
||||
## making brightnessctl work
|
||||
sudo chmod +s $(which brightnessctl) 2>&1 | tee -a "$LOG" || true
|
||||
sudo chmod +s "$(which brightnessctl)" 2>&1 | tee -a "$LOG" || true
|
||||
|
||||
printf "\n%.0s" {1..2}
|
||||
|
||||
@ -36,7 +36,7 @@ show_progress() {
|
||||
tput civis
|
||||
printf "\r${INFO} Installing ${YELLOW}%s${RESET} ..." "$package_name"
|
||||
|
||||
while ps -p $pid &> /dev/null; do
|
||||
while ps -p "$pid" &> /dev/null; do
|
||||
printf "\r${INFO} Installing ${YELLOW}%s${RESET} %s" "$package_name" "${spin_chars[i]}"
|
||||
i=$(( (i + 1) % 10 ))
|
||||
sleep 0.3
|
||||
@ -111,6 +111,7 @@ uninstall_package() {
|
||||
# Checking if package is installed
|
||||
if sudo dpkg -l | grep -q -w "^ii $1" ; then
|
||||
echo -e "${NOTE} removing $pkg ..."
|
||||
# shellcheck disable=SC2024
|
||||
sudo apt autoremove -y "$1" >> "$LOG" 2>&1 | grep -v "error: target not found"
|
||||
|
||||
if ! dpkg -l | grep -q -w "^ii $1" ; then
|
||||
|
||||
@ -37,10 +37,11 @@ fi
|
||||
|
||||
echo "$NOTE Cloning ${SKY_BLUE}GTK themes and Icons${RESET} repository..." 2>&1 | tee -a "$LOG"
|
||||
if git clone --depth=1 https://github.com/JaKooLit/GTK-themes-icons.git ; then
|
||||
cd GTK-themes-icons
|
||||
(
|
||||
cd GTK-themes-icons || exit 1
|
||||
chmod +x auto-extract.sh
|
||||
./auto-extract.sh
|
||||
cd ..
|
||||
)
|
||||
echo "$OK Extracted GTK Themes & Icons to ~/.icons & ~/.themes directories" 2>&1 | tee -a "$LOG"
|
||||
else
|
||||
echo "$ERROR Download failed for GTK themes and Icons.." 2>&1 | tee -a "$LOG"
|
||||
|
||||
@ -36,14 +36,14 @@ printf "${INFO} Installing ${YELLOW}hyprcursor $lang_tag${RESET} ...\n"
|
||||
if git clone --recursive -b $lang_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} ${MAGENTA}hyprcursor $lang_tag${RESET} installed successfully.\n" 2>&1 | tee -a "$MLOG"
|
||||
else
|
||||
echo -e "${ERROR} Installation failed for ${YELLOW}hyprcursor $lang_tag${RESET}" 2>&1 | tee -a "$MLOG"
|
||||
fi
|
||||
#moving the addional logs to Install-Logs directory
|
||||
mv $MLOG ../Install-Logs/ || true
|
||||
mv "$MLOG" ../Install-Logs/ || true
|
||||
cd ..
|
||||
else
|
||||
echo -e "${ERROR} Download failed for ${YELLOW}hyprcursor $lang_tag${RESET}" 2>&1 | tee -a "$LOG"
|
||||
|
||||
@ -36,14 +36,14 @@ printf "${INFO} Installing ${YELLOW}hyprgraphics $lang_tag${RESET} ...\n"
|
||||
if git clone --recursive -b $lang_tag https://github.com/hyprwm/hyprgraphics.git; then
|
||||
cd hyprgraphics || 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 hyprgraphics -j`nproc 2>/dev/null || getconf _NPROCESSORS_CONF`
|
||||
cmake --build ./build --config Release --target hyprgraphics -j"$(nproc 2>/dev/null || getconf _NPROCESSORS_CONF)"
|
||||
if sudo cmake --install ./build 2>&1 | tee -a "$MLOG" ; then
|
||||
printf "${OK} ${MAGENTA}hyprgraphics $lang_tag${RESET} installed successfully.\n" 2>&1 | tee -a "$MLOG"
|
||||
else
|
||||
echo -e "${ERROR} Installation failed for ${YELLOW}hyprgraphics $lang_tag${RESET}" 2>&1 | tee -a "$MLOG"
|
||||
fi
|
||||
#moving the addional logs to Install-Logs directory
|
||||
mv $MLOG ../Install-Logs/ || true
|
||||
mv "$MLOG" ../Install-Logs/ || true
|
||||
cd ..
|
||||
else
|
||||
echo -e "${ERROR} Download failed for ${YELLOW}hyprgraphics $lang_tag${RESET}" 2>&1 | tee -a "$LOG"
|
||||
|
||||
@ -47,14 +47,14 @@ printf "${INFO} Installing ${YELLOW}hypridle $idle_tag${RESET} ...\n"
|
||||
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} ${MAGENTA}hypridle $idle_tag${RESET} installed successfully.\n" 2>&1 | tee -a "$MLOG"
|
||||
else
|
||||
echo -e "${ERROR} Installation failed for ${YELLOW}hypridle $idle_tag${RESET}" 2>&1 | tee -a "$MLOG"
|
||||
fi
|
||||
#moving the addional logs to Install-Logs directory
|
||||
mv $MLOG ../Install-Logs/ || true
|
||||
mv "$MLOG" ../Install-Logs/ || true
|
||||
cd ..
|
||||
else
|
||||
echo -e "${ERROR} Download failed for ${YELLOW}hypridle $idle_tag${RESET}" 2>&1 | tee -a "$LOG"
|
||||
|
||||
@ -42,7 +42,7 @@ if git clone --recursive -b $lang_tag https://github.com/hyprwm/hyprland-protoco
|
||||
echo -e "${ERROR} Installation failed for ${YELLOW}hyprland-protocols $lang_tag${RESET}" 2>&1 | tee -a "$MLOG"
|
||||
fi
|
||||
#moving the addional logs to Install-Logs directory
|
||||
mv $MLOG ../Install-Logs/ || true
|
||||
mv "$MLOG" ../Install-Logs/ || true
|
||||
cd ..
|
||||
else
|
||||
echo -e "${ERROR} Download failed for ${YELLOW}hyprland-protocols $lang_tag${RESET}" 2>&1 | tee -a "$LOG"
|
||||
|
||||
@ -36,14 +36,14 @@ printf "${INFO} Installing ${YELLOW}hyprland-qt-support $lang_tag${RESET} ...\n"
|
||||
if git clone --recursive -b $lang_tag https://github.com/hyprwm/hyprland-qt-support.git; then
|
||||
cd hyprland-qt-support || exit 1
|
||||
cmake --no-warn-unused-cli -DCMAKE_BUILD_TYPE:STRING=Release -DCMAKE_INSTALL_PREFIX:PATH=/usr -DINSTALL_QML_PREFIX=/usr/lib/x86_64-linux-gnu/qt6/qml -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} ${MAGENTA}hyprland-qt-support $lang_tag${RESET} installed successfully.\n" 2>&1 | tee -a "$MLOG"
|
||||
else
|
||||
echo -e "${ERROR} Installation failed for ${YELLOW}hyprland-qt-support $lang_tag${RESET}" 2>&1 | tee -a "$MLOG"
|
||||
fi
|
||||
#moving the addional logs to Install-Logs directory
|
||||
mv $MLOG ../Install-Logs/ || true
|
||||
mv "$MLOG" ../Install-Logs/ || true
|
||||
cd ..
|
||||
else
|
||||
echo -e "${ERROR} Download failed for ${YELLOW}hyprland-qt-support $lang_tag${RESET}" 2>&1 | tee -a "$LOG"
|
||||
|
||||
@ -36,14 +36,14 @@ printf "${INFO} Installing ${YELLOW}hyprland-qtutils $lang_tag${RESET} ...\n"
|
||||
if git clone --recursive -b $lang_tag https://github.com/hyprwm/hyprland-qtutils.git; then
|
||||
cd hyprland-qtutils || 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} ${MAGENTA}hyprland-qtutils $lang_tag${RESET} installed successfully.\n" 2>&1 | tee -a "$MLOG"
|
||||
else
|
||||
echo -e "${ERROR} Installation failed for ${YELLOW}hyprland-qtutils $lang_tag${RESET}" 2>&1 | tee -a "$MLOG"
|
||||
fi
|
||||
#moving the addional logs to Install-Logs directory
|
||||
mv $MLOG ../Install-Logs/ || true
|
||||
mv "$MLOG" ../Install-Logs/ || true
|
||||
cd ..
|
||||
else
|
||||
echo -e "${ERROR} Download failed for ${YELLOW}hyprland-qtutils $lang_tag${RESET}" 2>&1 | tee -a "$LOG"
|
||||
|
||||
@ -43,7 +43,7 @@ if git clone --recursive -b $lang_tag https://github.com/hyprwm/hyprland.git; th
|
||||
echo -e "${ERROR} Installation failed for ${YELLOW}hyprland $lang_tag${RESET}" 2>&1 | tee -a "$MLOG"
|
||||
fi
|
||||
#moving the addional logs to Install-Logs directory
|
||||
mv $MLOG ../Install-Logs/ || true
|
||||
mv "$MLOG" ../Install-Logs/ || true
|
||||
cd ..
|
||||
else
|
||||
echo -e "${ERROR} Download failed for ${YELLOW}hyprland $lang_tag${RESET}" 2>&1 | tee -a "$LOG"
|
||||
|
||||
@ -7,7 +7,7 @@ nvidia_pkg=(
|
||||
nvidia-driver
|
||||
firmware-misc-nonfree
|
||||
nvidia-kernel-dkms
|
||||
linux-headers-$(uname -r)
|
||||
linux-headers-"$(uname -r)"
|
||||
libnvidia-egl-wayland1
|
||||
libva-wayland2
|
||||
libnvidia-egl-wayland1
|
||||
|
||||
@ -55,6 +55,7 @@ done
|
||||
for login_manager in "${login[@]}"; do
|
||||
if dpkg -l | grep -q "^ii $login_manager"; then
|
||||
echo "Disabling $login_manager..."
|
||||
# shellcheck disable=SC2024
|
||||
sudo systemctl disable "$login_manager.service" >> "$LOG" 2>&1 || echo "Failed to disable $login_manager" >> "$LOG"
|
||||
echo "$login_manager disabled."
|
||||
fi
|
||||
@ -64,6 +65,7 @@ done
|
||||
for manager in "${login[@]}"; do
|
||||
if systemctl is-active --quiet "$manager.service" > /dev/null 2>&1; then
|
||||
echo "$manager.service is active, disabling it..." >> "$LOG" 2>&1
|
||||
# shellcheck disable=SC2024
|
||||
sudo systemctl disable "$manager.service" --now >> "$LOG" 2>&1 || echo "Failed to disable $manager.service" >> "$LOG"
|
||||
else
|
||||
echo "$manager.service is not active" >> "$LOG" 2>&1
|
||||
|
||||
@ -337,9 +337,9 @@ execute_script "hyprcursor.sh"
|
||||
sleep 1
|
||||
execute_script "hyprgraphics.sh"
|
||||
sleep 1
|
||||
execute_script "hypr-qt-support.sh"
|
||||
execute_script "hyprland-qt-support.sh"
|
||||
sleep 1
|
||||
execute_script "hypr-qtutils.sh"
|
||||
execute_script "hyprland-qtutils.sh"
|
||||
sleep 1
|
||||
execute_script "hyprland.sh"
|
||||
sleep 1
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user