diff --git a/install-scripts/swww.sh b/install-scripts/swww.sh index c6d869b..b47dc96 100755 --- a/install-scripts/swww.sh +++ b/install-scripts/swww.sh @@ -5,6 +5,7 @@ swww=( cargo liblz4-dev +rustc ) #specific branch or release @@ -35,6 +36,14 @@ for PKG1 in "${swww[@]}"; do fi done +printf "${NOTE} Force installing packages...\n" + for FORCE in "${swww[@]}"; do + sudo apt-get --reinstall install -y "$FORCE" 2>&1 | tee -a "$LOG" + [ $? -ne 0 ] && { echo -e "\e[1A\e[K${ERROR} - $FORCE Package installation failed, Please check the installation logs"; exit 1; } + done + +printf "\n\n" + printf "${NOTE} Installing swww\n" # Check if swww folder exists @@ -44,7 +53,7 @@ if [ -d "swww" ]; then git pull origin main 2>&1 | tee -a "$MLOG" else printf "${NOTE} Cloning swww repository...\n" - if git clone --recursive -b $swww_tag https://github.com/Horus645/swww.git; then + if git clone --recursive https://github.com/Horus645/swww.git; then cd swww || exit 1 else echo -e "${ERROR} Download failed for swww" 2>&1 | tee -a "$LOG" @@ -52,14 +61,6 @@ else fi fi -# install new rust -# Define environment variables for non-interactive installation -export RUSTUP_INIT_SKIP_PATH_CHECK=yes -export RUSTUP_INIT_SKIP_CONFIRMATION=yes - -# Download and execute the Rust installer script, automatically answering "yes" to all prompts -curl --proto '=https' --tlsv1.3 https://sh.rustup.rs -sSf | sh -s -- -y --no-modify-path 2>&1 | tee -a "$LOG" || true - # Proceed with the rest of the installation steps source "$HOME/.cargo/env" || true