Skip to content

Commit 6ee3007

Browse files
aKqir24aKqir24
committed
update: refactor debugger & messages
1 parent d1ec7bd commit 6ee3007

File tree

6 files changed

+53
-63
lines changed

6 files changed

+53
-63
lines changed

‎scripts/apply.sh‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -69,11 +69,11 @@ set_THEME() {
6969
# Reload Gtk themes using xsettingsd
7070
reloadTHEMES() {
7171
verbose info "Reloading Gtk & Icon themes"
72-
if command -v 'xsettingsd'>"$LOG_FILEPATH"; then
73-
(pidof "xsettingsd" && pkill -HUP xsettingsd)>"$LOG_FILEPATH" 2>&1
74-
xsettingsd --config "$XSETTINGSD_CONF">"$LOG_FILEPATH" 2>&1 &
72+
if command -v 'xsettingsd'>> "$LOG_FILEPATH"; then
73+
(pidof "xsettingsd" && pkill -HUP xsettingsd)>> "$LOG_FILEPATH" 2>&1
74+
xsettingsd --config "$XSETTINGSD_CONF">> "$LOG_FILEPATH" 2>&1 &
7575
fi
76-
gtk-update-icon-cache "$USER_ICONS_FOLDER/">"$LOG_FILEPATH" 2>&1 &
76+
gtk-update-icon-cache "$USER_ICONS_FOLDER/">> "$LOG_FILEPATH" 2>&1 &
7777
gsettings set org.gnome.desktop.interface gtk-theme 'pywal' &
7878

7979
}

‎scripts/config.sh‎

Lines changed: 4 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,20 +1,16 @@
11
#!/bin/bash
22

33
# Default options config values
4-
GUI=false
5-
LOAD=false
6-
DEBUG=false
7-
RESET=false
8-
SETUP=false
9-
RELOAD=false
10-
VERBOSE=false
4+
DEFAULT_FALSE_CONFIG=('GUI' 'LOAD' 'DEBUG' 'RESET' 'SETUP' 'RELOAD' 'VERBOSE' 'ANIMATED_WALLPAPER')
5+
for config_var in "${DEFAULT_FALSE_CONFIG[@]}"; do
6+
[[ -z ${!config_var} ]] && declare -g "$config_var=false"
7+
done
118
THEMING_GTK=true
129
THEME_MODE="dark"
1310
THEMING_ICONS=true
1411
PYWAL_BACKEND="wal"
1512
THEME_ACCENT_COLOR=2
1613
WALLPAPER_CYCLE="static"
17-
ANIMATED_WALLPAPER=false
1814
WALLPAPER_BACKEND="none"
1915
THEMED_PROGRAMS=( 'i3status_rust' 'alacritty' 'rofi' 'dunst' )
2016

‎scripts/dialogs.sh‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ SETUPS=( wallBACK "Backend In Use" off \
1919
# Start Configuration dialogs
2020
verbose info "Running kdialog for configuration..." &
2121
ToCONFIG=$( kdialog --checklist "Available Configs" "${SETUPS[@]}" --separate-output )
22-
assignTEMPCONF >"$LOG_FILEPATH" && [[ -z $ToCONFIG ]] && cancelCONFIG
22+
assignTEMPCONF >> "$LOG_FILEPATH" && [[ -z $ToCONFIG ]] && cancelCONFIG
2323
theming_values() {
2424
THEME_MODE=$( kdialog --yes-label "Light" --no-label "Dark" \
2525
--yesno "Select an theme mode, it can be either:" && echo "light" || echo "dark")
@@ -31,7 +31,7 @@ theming_values() {
3131
# Configuration Dialogs
3232
for config in $ToCONFIG; do
3333
if [[ $config == 'wallGTK' ]] || [[ $config == 'wallICONS' ]]; then
34-
theming_values >"$LOG_FILEPATH" ; unset -f theming_values
34+
theming_values >> "$LOG_FILEPATH" ; unset -f theming_values
3535
theming_values() { echo "" ; }
3636
fi
3737
case "$config" in

‎scripts/startup.sh‎

Lines changed: 21 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -1,40 +1,39 @@
11
#!/bin/sh
22

3+
# Check for the following paths
4+
if [[ ! -d $PYWAL_CACHE_DIR ]]; then
5+
mkdir -p "$PYWAL_CACHE_DIR"
6+
fi
7+
8+
# Check PYWAL_OUT_DIR for temp folder
9+
if [[ ! -d $PYWAL_TEMPLATES ]]; then
10+
mkdir -p "$PYWAL_TEMPLATES"
11+
fi
12+
13+
# Check if some features are already present
14+
INSTALLED_TAG='(installed)'
15+
if [ -f $USER_ICONS_FOLDER"/index.theme" ]; then ICON_INS_TAG="$INSTALLED_TAG"; else unset ICON_INS_TAG; fi
16+
if [ -f $USER_THEME_FOLDER"/index.theme" ]; then GTK_INS_TAG="$INSTALLED_TAG"; else unset GTK_INS_TAG; fi
17+
318
# Check for required dependencies and figure out program the mode
419
command -v wal > "$LOG_FILEPATH" || verbose error "pywal16 is not installed, Please install it!"
520
if ! $SETUP && ! $GUI; then
6-
verbose info "Using walset CLI mode!!"
21+
verbose info "Using walset in CLI mode!!"
722
return 0
823
fi
924

1025
if $SETUP; then
11-
command -v kdialog >"$LOG_FILEPATH" 2>&1 \
12-
&& verbose info "Using SETUP (deprecated) dialog mode!!" \
26+
command -v kdialog >> "$LOG_FILEPATH" 2>&1 \
27+
&& verbose info "Using walset in SETUP (deprecated) dialog mode!!" \
1328
|| verbose error "kdialog is not installed. Please install it!"
1429
fi
1530

1631
if $GUI; then
17-
command -v python3 >"$LOG_FILEPATH" 2>&1 \
32+
command -v python3 >> "$LOG_FILEPATH" 2>&1 \
1833
|| verbose error "python3 is not installed. Please install it!"
1934

20-
command -v python3-gi >"$LOG_FILEPATH" 2>&1 \
35+
command -v python3-gi >> "$LOG_FILEPATH" 2>&1 \
2136
|| verbose error "python3-gi is not installed. Please install it!"
2237

23-
verbose info "Using GUI mode!!"
38+
verbose info "Using walset in GUI mode!!"
2439
fi
25-
26-
27-
# Check for the following paths
28-
if [[ ! -d $PYWAL_CACHE_DIR ]]; then
29-
mkdir -p "$PYWAL_CACHE_DIR"
30-
fi
31-
32-
# Check PYWAL_OUT_DIR for temp folder
33-
if [[ ! -d $PYWAL_TEMPLATES ]]; then
34-
mkdir -p "$PYWAL_TEMPLATES"
35-
fi
36-
37-
# Check if some features are already present
38-
INSTALLED_TAG='(installed)'
39-
if [[ -f $USER_ICONS_FOLDER"/index.theme" ]]; then ICON_INS_TAG="$INSTALLED_TAG"; else unset ICON_INS_TAG; fi
40-
if [[ -f $USER_THEME_FOLDER"/index.theme" ]]; then GTK_INS_TAG="$INSTALLED_TAG"; else unset GTK_INS_TAG; fi

‎scripts/wallpaper.sh‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -80,7 +80,7 @@ set_wallpaper_with_mode() {
8080
# Detect installed setters once
8181
choose_available_setter() {
8282
for installed_wallsetter in "${WALL_SETTERS[@]}"; do
83-
command -v "$installed_wallsetter" >"$LOG_FILEPATH" 2>&1 && \
83+
command -v "$installed_wallsetter" >> "$LOG_FILEPATH" 2>&1 && \
8484
AVAILABLE_SETTERS+=("$installed_wallsetter")
8585
done
8686
}
@@ -105,19 +105,19 @@ set_wallpaper_with_mode() {
105105
done
106106

107107
# Kill running wallpaper deamon if running
108-
pidof "${CH_WALLSETTER}" &>"$LOG_FILEPATH" && killall "${CH_WALLSETTER}" &>/dev/null
108+
pidof "${CH_WALLSETTER}" &>> "$LOG_FILEPATH" && killall "${CH_WALLSETTER}" &>/dev/null
109109

110110
# Use the wallpaper backend first available
111111
case "$CH_WALLSETTER" in
112-
"xgifwallpaper") nohup xgifwallpaper -s $xgifwallpaperMode "$image_path" >"$LOG_FILEPATH" 2>&1 & disown || wallsetERROR ;;
112+
"xgifwallpaper") nohup xgifwallpaper -s $xgifwallpaperMode "$image_path" >> "$LOG_FILEPATH" 2>&1 & disown || wallsetERROR ;;
113113
"xwallpaper") xwallpaper "--$xWallMode" "$image_path" || wallsetERROR;;
114114
"hsetroot") hsetroot "$hsetrootMode" "$image_path" || wallsetERROR;;
115115
"feh") feh --bg-"$fehMode" "$image_path" || wallsetERROR;;
116116
"nitrogen") nitrogen --set-$nitrogenMode "$image_path" || wallsetERROR;;
117-
"swaybg") swaybg -i "$image_path" --mode "$swayMode" >"$LOG_FILEPATH" 2>&1 & disown || wallsetERROR;;
117+
"swaybg") swaybg -i "$image_path" --mode "$swayMode" >> "$LOG_FILEPATH" 2>&1 & disown || wallsetERROR;;
118118
"awww")
119-
pidof "${CH_WALLSETTER}-deamon" &>"$LOG_FILEPATH" || "${CH_WALLSETTER}-deamon" &>"$LOG_FILEPATH"
120-
awww img "$image_path" --resize "$awwwMode" >"$LOG_FILEPATH" 2>&1 & disown || wallsetERROR
119+
pidof "${CH_WALLSETTER}-deamon" &>> "$LOG_FILEPATH" || "${CH_WALLSETTER}-deamon" &>"$LOG_FILEPATH"
120+
awww img "$image_path" --resize "$awwwMode" >> "$LOG_FILEPATH" 2>&1 & disown || wallsetERROR
121121
;;
122122
"xfconf-query")
123123
if xfconf-query --channel xfce4-desktop --property /backdrop/screen0/monitor0/image-style --set $xfceMode; then
@@ -137,9 +137,9 @@ setup_wallpaper() {
137137
verbose info "Changing the wallpaper"
138138
case "$wallpaper" in
139139
*.png) cp "$wallpaper" "$WALLPAPER_CACHE" ;;
140-
*.gif) magick "$wallpaper" -coalesce -flatten "$WALLPAPER_CACHE">"$LOG_FILEPATH"
140+
*.gif) magick "$wallpaper" -coalesce -flatten "$WALLPAPER_CACHE">> "$LOG_FILEPATH"
141141
$wallpaper_animated && cp "$wallpaper" "$WALLPAPER_CACHE.gif";;
142-
*) magick "$wallpaper" "$WALLPAPER_CACHE">"$LOG_FILEPATH"
142+
*) magick "$wallpaper" "$WALLPAPER_CACHE">> "$LOG_FILEPATH"
143143
esac
144144
case "$wallpaper_type" in
145145
"solid") magick -size 10x10 xc:"$color8" "$WALLPAPER_CACHE"

‎walset.sh‎

Lines changed: 14 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,5 @@
11
#!/bin/bash
22

3-
# Import all the scripts
4-
[[ ! -e "$(pwd)/scripts" ]] && WORK_PATH="$(dirname "$0")" || WORK_PATH="$(pwd)"
5-
6-
SCRIPT_PATH="$WORK_PATH/scripts"
7-
SCRIPT_FILES=(messages paths config startup apply)
8-
for script in "${SCRIPT_FILES[@]}"; do . "$SCRIPT_PATH/$script.sh"; done
9-
103
# Options To be used
114
OPTS=$(getopt -o VRDLrh --long gui,setup,reset,debug,verbose,load,reload,help -- "$@")
125
[ $? -ne 0 ] && exit 1 && eval set -- "$OPTS"
@@ -24,21 +17,22 @@ while true; do
2417
esac
2518
done
2619

20+
# Import all the scripts
21+
[[ ! -e "$(pwd)/scripts" ]] && WORK_PATH="$(dirname "$0")" || WORK_PATH="$(pwd)"
22+
23+
SCRIPT_PATH="$WORK_PATH/scripts"
24+
SCRIPT_FILES=(messages paths config startup apply)
25+
for script in "${SCRIPT_FILES[@]}"; do . "$SCRIPT_PATH/$script.sh"; done
26+
2727
# Debug option logic
28-
debug() {
29-
if $DEBUG; then
30-
while true; do
31-
sleep 1 ; cat "$LOG_FILEPATH"
32-
done
33-
else
34-
LOG_FILEPATH=/dev/null
35-
fi
36-
}
37-
debug &
28+
if $DEBUG; then
29+
tail -F "$LOG_FILEPATH" &
30+
TAIL_PID=$!
31+
fi
3832

3933
# GUI dialog Configuration
4034
if $GUI && $SETUP; then
41-
VERBOSE=true ; verbose sorry "You can only select one of the config optios." ; exit 1
35+
VERBOSE=true ; verbose sorry "You can only select one of the config options." ; exit 1
4236
elif $SETUP; then
4337
. "$SCRIPT_PATH/dialogs.sh"
4438
elif $GUI; then
@@ -86,5 +80,6 @@ applyWAL "$wallpaper_path" "$pywal16_backend" \
8680

8781
# Finalize Process and making them faster by Functions
8882
linkCONF_DIR ; if [[ $wallpaper_type != "none" ]]; then setup_wallpaper ;fi
89-
verbose info "Process finished!!"
83+
[ -n "$TAIL_PID" ] && kill "$TAIL_PID" # Kills the debugger when enabled
84+
verbose info "Process finished!!"
9085
exit 0

0 commit comments

Comments
 (0)