From 04c632ca9e3fe6c3fc26c0da8c7196815702a108 Mon Sep 17 00:00:00 2001 From: JaKooLit Date: Tue, 4 Feb 2025 23:17:20 +0900 Subject: [PATCH] another update --- install-scripts/01-hypr-pkgs.sh | 4 +--- install-scripts/rofi-wayland.sh | 9 +++------ 2 files changed, 4 insertions(+), 9 deletions(-) diff --git a/install-scripts/01-hypr-pkgs.sh b/install-scripts/01-hypr-pkgs.sh index bcf3b1e..ac092ff 100755 --- a/install-scripts/01-hypr-pkgs.sh +++ b/install-scripts/01-hypr-pkgs.sh @@ -104,14 +104,12 @@ done # install YAD from assets. NOTE This is downloaded from SID repo and sometimes # Trixie is removing YAD for some strange reasons - # Check if yad is installed if ! command -v yad &> /dev/null; then - # yad is not installed, so install it echo "${INFO} Installing ${YELLOW}YAD from assets${RESET} ..." sudo dpkg -i assets/yad_0.40.0-1+b2_amd64.deb - # Handle potential dependency issues after installing the .deb sudo apt-get install -f -y + echo "${INFO} ${YELLOW}YAD from assets${RESET} succesfully installed ..." fi printf "\n%.0s" {1..2} diff --git a/install-scripts/rofi-wayland.sh b/install-scripts/rofi-wayland.sh index 5f9bb29..9d837e1 100755 --- a/install-scripts/rofi-wayland.sh +++ b/install-scripts/rofi-wayland.sh @@ -12,6 +12,7 @@ rofi=( libnl-3-dev libasound2-dev libstartup-notification0-dev + libwayland-client0 libxcb-ewmh-dev libxcb-cursor-dev libxcb-icccm4-dev @@ -43,11 +44,7 @@ MLOG="install-$(date +%d-%H%M%S)_rofi_wayland2.log" # uninstall other rofi for PKG in "rofi" "bison"; do - uninstall_package "$PKG" 2>&1 | tee -a "$LOG" - if [ $? -ne 0 ]; then - echo -e "\e[1A\e[K${ERROR} - $PKG uninstallation had failed, please check the log" - exit 1 - fi + uninstall_package "$PKG" "$LOG" done sleep 1 @@ -56,7 +53,7 @@ printf "\n%.0s" {1..2} printf "\n%s - Installing ${SKY_BLUE}rofi-wayland dependencies${RESET}.... \n" "${INFO}" for FORCE in "${rofi[@]}"; do - sudo apt-get --reinstall install -y "$FORCE" 2>&1 | tee -a "$LOG" + re_install_package "$FORCE" 2>&1 | tee -a "$LOG" done printf "\n%.0s" {1..2}