update: debug fix & changes

Author: aKqir24

scripts/apply.sh

@@ -2,15 +2,27 @@
 
 # Function to apply wallpaper using pywal16
 applyWAL() {	
-	generateGTKTHEME ; generateICONSTHEME 
+	downloadTemplates ; generateGTKTHEME ; generateICONSTHEME 
 	verbose info "Running pywal to generate color scheme"
-	#echo "wal $4 --backend $2 $3 -i $1 -n --out-dir $PYWAL_CACHE_DIR $5"
 	sh -c "wal -q $4 --backend $2 $3 -i $1 -n --out-dir $PYWAL_CACHE_DIR $5" || pywalerror
 	[[ -f $PYWAL_CACHE_DIR/colors.sh ]] && . "${PYWAL_CACHE_DIR}/colors.sh" # Load Colors & other values to be used
 	generateGTKTHEME 4 ; set_THEME "Icon" "Net/IconThemeName" && set_THEME "Gtk" "Net/ThemeName" ; applyToPrograms 
 	if $RELOAD; then reloadTHEMES; fi
 }
 
+downloadTemplates() {
+	if [[ ! -d $THEMING_ASSETS ]]; then
+		if [[ ! -z $CUSTOM_THEME_ASSETS ]]; then 
+			curl -O "$CUSTOM_THEME_ASSETS" "$THEMING_ASSETS" | unzip - || \
+				git clone "$CUSTOM_THEME_ASSETS" "$THEMING_ASSETS" || true
+			verbose info "Downloading the custom theme template assets files"
+		else
+			git clone https://github.com/aKqir24/walset-pywal16-templates.git "$THEMING_ASSETS" || true
+			verbose info "Cloning the default theme template assets repository"
+		fi
+	fi
+}
+
 # Apply gtk theme / reload gtk theme
 generateGTKTHEME() {
 	if $theming_gtk || $RESET; then

scripts/paths.sh

@@ -1,7 +1,7 @@
 #!/bin/bash
 
 # DEFAULT PATHS FOR CONFIG:
-THEMING_ASSETS="$WORK_PATH/assets"
+THEMING_ASSETS="$HOME/.local/share/walset/assets"
 DEFAULT_PYWAL16_OUT_DIR="$HOME/.cache/wal"
 WALLPAPER_CONF_PATH="$HOME/.config/walset.toml"
 XSETTINGSD_CONF="$HOME/.xsettingsd.conf"

scripts/theming/gtk.sh

@@ -30,7 +30,7 @@ for gtkCSSFile in "${GTK_CSS_FILES[@]}"; do
   theme_style_file="$USER_THEME_FOLDER/$base_name/$(basename "$gtkCSSFile")"
   [[ ! -e $temp_file_path ]] && ln -s "$base_file" "$temp_file_path"
   [[ ! -e $theme_style_file ]] && ln -sf "$PYWAL_CACHE_DIR/$gtk_tmp_file" "$theme_style_file"
-  if [[ $XDG_SESSION_TYPE == "wayland" ]] && [[ $base_filename == "gtk-4.0.base" ]]; then
+  if [[ ! -z $WAYLAND_DISPLAY ]] && [[ $base_filename == "gtk-4.0.base" ]]; then
 	  [[ ! -d "$WAYLAND_GTK4" ]] && mkdir -p "$WAYLAND_GTK4" 
 	  ln -sf "$theme_style_file" "$WAYLAND_GTK4"
 	  ln -sf "$(dirname "$theme_style_file")/assets" "$WAYLAND_GTK4"

scripts/wallpaper.sh

@@ -71,7 +71,7 @@ set_wallpaper_with_mode() {
 	fi
 
 	# Choose setter type
-	if [[ "$wallpaper_animated" == true && "$wallpaper" == *.gif ]]; then
+	if [[ "$wallpaper_animated" == true ]]; then
 		WALL_SETTERS=(${WALL_SETTERS_ANIMATED[@]})
 	else
 		WALL_SETTERS=(${WALL_SETTERS_STATIC[@]})
@@ -90,7 +90,7 @@ set_wallpaper_with_mode() {
 		WALL_SETTERS=(${WALL_SETTERS_STATIC[@]})
 		choose_available_setter
 		verbose sorry "Wallpaper doesn’t support animation, using static instead."
-	else
+	elif [[ "$wallpaper" == *.gif ]]; then
 		image_path="$image_path.gif"
 	fi	
 

walset.sh

@@ -1,19 +1,14 @@
 #!/bin/bash
 
 # Import all the scripts
-if [[ ! -e "$(pwd)/scripts" ]]; then
-	WORK_PATH="$(dirname "$0")"
-else
-	WORK_PATH="$(pwd)"
-fi
+[[ ! -e "$(pwd)/scripts" ]] && WORK_PATH="$(dirname "$0")" || WORK_PATH="$(pwd)"
 
 LOG_FILEPATH="/tmp/walset.log"
 SCRIPT_PATH="$WORK_PATH/scripts"
 SCRIPT_FILES=(messages paths config startup apply)
 for script in "${SCRIPT_FILES[@]}"; do . "$SCRIPT_PATH/$script.sh"; done
 
 # Options To be used
-# TODO: Debug option
 OPTS=$(getopt -o VRDLrh --long gui,setup,reset,debug,verbose,load,reload,help -- "$@")
 [ $? -ne 0 ] && exit 1 && eval set -- "$OPTS"
 while true; do
@@ -31,7 +26,16 @@ while true; do
 done
 
 # Debug option logic
-$DEBUG && cat "$LOG_FILEPATH" || LOG_FILEPATH=/dev/null
+debug() {
+	if $DEBUG; then
+		while true; do
+			sleep 1 ;  && cat "$LOG_FILEPATH" 
+		done
+	else
+		LOG_FILEPATH=/dev/null
+	fi
+}
+debug &
 
 # GUI dialog Configuration
 if $GUI && $SETUP; then