Skip to content

Commit d2e674d

Browse files
committed
patch for new HyDE:
1 parent ed044ed commit d2e674d

File tree

1 file changed

+6
-5
lines changed

1 file changed

+6
-5
lines changed

Scripts/Patch-Theme

+6-5
Original file line numberDiff line numberDiff line change
@@ -94,9 +94,10 @@ if [[ -z $1 || -z $2 ]]; then
9494
fi
9595

9696
dcolTheme="Wall-Dcol"
97-
[[ -f "${confDir}/hyde/wallbash/theme" ]] && dcolTheme="theme"
98-
dcolDir="${confDir}/hyde/wallbash/${dcolDest}"
99-
[ ! -d "${dcolDir}" ] && print_prompt "[ERROR]" "${dcolTheme} do not exist!" && exit 1
97+
dcolDir="${confDir}/hyde/wallbash/${dcolTheme}"
98+
[[ -d "${HYDE_DATA_HOME}/wallbash/theme" ]] && dcolTheme="theme"
99+
[[ -d "${HYDE_DATA_HOME}/wallbash/theme" ]] && dcolDir="${XDG_DATA_HOME}/hyde/wallbash/theme"
100+
[ ! -d "${dcolDir}" ] && print_prompt "[ERROR]" "${dcolDir} do not exist!" && exit 1
100101

101102
# set parameters
102103
Fav_Theme="$1"
@@ -150,7 +151,7 @@ print_prompt "Patching" -g " --// ${Fav_Theme} //-- " "from " -b "${Theme_Dir}\n
150151
Fav_Theme_Dir="${Theme_Dir}/Configs/.config/hyde/themes/${Fav_Theme}"
151152
[ ! -d "${Fav_Theme_Dir}" ] && print_prompt -r "[ERROR] " "'${Fav_Theme_Dir}'" -y " Do not Exist" && exit 1
152153

153-
config=$(find "${dcolDir}" -type f -name "*.dcol" | awk -v favTheme="${Fav_Theme}" -F '$dcolTheme/' '{gsub(/\.dcol$/, ".theme"); print ".config/hyde/themes/" favTheme "/" $2}')
154+
config=$(find "${dcolDir}" -type f -name "*.dcol" | awk -v favTheme="${Fav_Theme}" -F "${dcolTheme}/" '{gsub(/\.dcol$/, ".theme"); print ".config/hyde/themes/" favTheme "/" $2}')
154155
restore_list=""
155156

156157
while IFS= read -r fchk; do
@@ -297,7 +298,7 @@ trap 'rm "${Theme_Dir}/restore_cfg.lst"' EXIT
297298
print_prompt -g "\n[exec] " "restore_cfg.sh \"${Theme_Dir}/restore_cfg.lst\" \"${Theme_Dir}/Configs\" \"${Fav_Theme}\"\n"
298299
"${CloneDir}/Scripts/restore_cfg.sh" "${Theme_Dir}/restore_cfg.lst" "${Theme_Dir}/Configs" "${Fav_Theme}" &>/dev/null
299300

300-
if [ "${3}" == "--skipcaching" ]; then
301+
if [ "${3}" != "--skipcaching" ]; then
301302
if [ -f "$HOME/.local/lib/hyde/swwwallcache.sh" ]; then
302303
"$HOME/.local/lib/hyde/swwwallcache.sh" -t "${Fav_Theme}"
303304
elif [ -f "$HOME/.local/share/bin/swwwallcache.sh" ]; then

0 commit comments

Comments
 (0)