EvolutionOS
/
neofetch
Archived
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Refactoring according to reviews

This commit is contained in:
Steve Forget 2019-09-22 21:12:30 +02:00
parent aaf4a5497e
commit 9b9ea1b977
No known key found for this signature in database
GPG Key ID: 0377B7267CA511E6
1 changed files with 16 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

41
neofetch
View File

@ -3203,7 +3203,7 @@ END
[[ -z "$term_font" ]] && term_font="Monospace 12" [[ -z "$term_font" ]] && term_font="Monospace 12"
;; ;;
"conemu-"*) conemu-*)
local ce_arg_list local ce_arg_list
local ce_arg_idx local ce_arg_idx
local ce_conf local ce_conf
@ -3213,37 +3213,28 @@ END
for ce_arg_idx in "${!ce_arg_list[@]}"; do for ce_arg_idx in "${!ce_arg_list[@]}"; do
# Search for "-LoadCfgFile" arg # Search for "-LoadCfgFile" arg
[[ "${ce_arg_list[$ce_arg_idx]}" != -LoadCfgFile ]] && continue [[ "${ce_arg_list[$ce_arg_idx]}" == -LoadCfgFile ]] && {
# Conf path is the next arg
# Conf path is the next arg ce_conf=${ce_arg_list[++ce_arg_idx]}
((++ce_arg_idx)) break
ce_conf="${ce_arg_list[$ce_arg_idx]}" }
break
done done
# https://conemu.github.io/en/ConEmuXml.html#search-sequence # https://conemu.github.io/en/ConEmuXml.html#search-sequence
local ce_seq=( for ce_conf in "$ce_conf" "${ConEmuDir-}\ConEmu.xml" "${ConEmuDir-}\.ConEmu.xml" \
"$ce_conf" "${ConEmuBaseDir-}\ConEmu.xml" "${ConEmuBaseDir-}\.ConEmu.xml" \
"$ConEmuDir\ConEmu.xml" "$APPDATA\ConEmu.xml" "$APPDATA\.ConEmu.xml"; do
"$ConEmuDir\.ConEmu.xml"
"$ConEmuBaseDir\ConEmu.xml"
"$ConEmuBaseDir\.ConEmu.xml"
"$APPDATA\ConEmu.xml"
"$APPDATA\.ConEmu.xml"
)
for ce_conf in "${ce_seq[@]}"; do
# Search for first conf file available # Search for first conf file available
[[ ! -f "$ce_conf" ]] && continue [[ -f "$ce_conf" ]] && {
# Very basic XML parsing
# Very basic XML parsing term_font="$(awk '/name="FontName"/ && match($0, /data="([^"]*)"/) {
term_font="$(awk '/name="FontName"/ && match($0, /data="([^"]*)"/) \ print substr($0, RSTART+6, RLENGTH-7)}' "$ce_conf")"
{print substr($0, RSTART+6, RLENGTH-7)}' "$ce_conf")" break
break }
done done
# Null-terminated contents in /proc/registry files triggers a Bash warning # Null-terminated contents in /proc/registry files triggers a Bash warning
[[ -z "$term_font" ]] && read -r term_font < \ [[ "$term_font" ]] || read -r term_font < \
/proc/registry/HKEY_CURRENT_USER/Software/ConEmu/.Vanilla/FontName /proc/registry/HKEY_CURRENT_USER/Software/ConEmu/.Vanilla/FontName
;; ;;
esac esac