Merge pull request #52 from JaKooLit/development

update on swww.sh and the install.sh
This commit is contained in:
Ja.KooLit 2024-04-30 00:36:57 +09:00 committed by GitHub
commit 090a76e99f
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 21 additions and 1 deletions

View File

@ -2,6 +2,11 @@
# 💫 https://github.com/JaKooLit 💫 # # 💫 https://github.com/JaKooLit 💫 #
# SWWW - Wallpaper Utility # # SWWW - Wallpaper Utility #
swww=(
cargo
liblz4-dev
)
## WARNING: DO NOT EDIT BEYOND THIS LINE IF YOU DON'T KNOW WHAT YOU ARE DOING! ## ## WARNING: DO NOT EDIT BEYOND THIS LINE IF YOU DON'T KNOW WHAT YOU ARE DOING! ##
# Determine the directory where the script is located # Determine the directory where the script is located
SCRIPT_DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )" SCRIPT_DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"
@ -16,6 +21,17 @@ source "$(dirname "$(readlink -f "$0")")/Global_functions.sh"
LOG="Install-Logs/install-$(date +%d-%H%M%S)_swww2.log" LOG="Install-Logs/install-$(date +%d-%H%M%S)_swww2.log"
MLOG="install-$(date +%d-%H%M%S)_swww.log" MLOG="install-$(date +%d-%H%M%S)_swww.log"
# Installation of swww compilation needed
printf "\n%s - Installing swww dependencies.... \n" "${NOTE}"
for PKG1 in "${swww[@]}"; do
install_package "$PKG1" 2>&1 | tee -a "$LOG"
if [ $? -ne 0 ]; then
echo -e "\e[1A\e[K${ERROR} - $PKG1 install had failed, please check the install.log"
exit 1
fi
done
printf "${NOTE} Installing swww\n" printf "${NOTE} Installing swww\n"
# Check if swww folder exists # Check if swww folder exists
@ -34,7 +50,8 @@ else
fi fi
# Proceed with the rest of the installation steps # Proceed with the rest of the installation steps
source "$HOME/.cargo/env" source "$HOME/.cargo/env" || true
cargo build --release 2>&1 | tee -a "$MLOG" cargo build --release 2>&1 | tee -a "$MLOG"
# Copy binaries to /usr/bin/ # Copy binaries to /usr/bin/
sudo cp target/release/swww /usr/bin/ 2>&1 | tee -a "$MLOG" sudo cp target/release/swww /usr/bin/ 2>&1 | tee -a "$MLOG"

View File

@ -90,6 +90,9 @@ thunar=""
xdph="" xdph=""
zsh="" zsh=""
# Export PKG_CONFIG_PATH for libinput
export PKG_CONFIG_PATH=/usr/lib/x86_64-linux-gnu/pkgconfig
# Define the directory where your scripts are located # Define the directory where your scripts are located
script_directory=install-scripts script_directory=install-scripts