luisgulo/neofetch
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Revert "Ascii: Glob match ascii art"

Browse source 
This reverts commit af97d1a645.
This commit is contained in:
Dylan Araps 2017-01-02 13:01:24 +11:00
parent af97d1a645
commit c41babb6f9
1 changed files with 23 additions and 17 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

40
neofetch
View file

@ -20,7 +20,7 @@ export LANG=C
export PATH="/usr/sbin:/sbin:${PATH}" export PATH="/usr/sbin:/sbin:${PATH}"
# Set no case match. # Set no case match.
shopt -s nocasematch nocaseglob shopt -s nocasematch
# Reset colors and bold. # Reset colors and bold.
reset="\033[0m" reset="\033[0m"
@ -1922,28 +1922,34 @@ get_ascii() {
[[ "$ascii" != "distro" && ! -f "$ascii" ]] && \ [[ "$ascii" != "distro" && ! -f "$ascii" ]] && \
err "Ascii: Ascii file not found, using distro ascii." err "Ascii: Ascii file not found, using distro ascii."
# Find ascii art dir. # Lowercase the distro name so we can match it to a file.
if [[ -d "/usr/share/neofetch/ascii/distro" ]]; then if (("$bash_version" <= 3)); then
ascii_dir="/usr/share/neofetch/ascii/distro" ascii="$(tr '[:upper:]' '[:lower:]' <<< "$ascii_distro")"
else
ascii="${ascii_distro,,}"
fi
elif [[ -d "/usr/local/share/neofetch/ascii/distro" ]]; then if [[ -f "/usr/share/neofetch/ascii/distro/${ascii/ *}" ]]; then
ascii_dir="/usr/local/share/neofetch/ascii/distro" ascii="/usr/share/neofetch/ascii/distro/${ascii/ *}"
elif [[ -d "/data/data/com.termux/files/usr/share/neofetch/ascii/distro" ]]; then elif [[ -f "/usr/local/share/neofetch/ascii/distro/${ascii/ *}" ]]; then
ascii_dir="/data/data/com.termux/files/usr/share/neofetch/ascii/distro" ascii="/usr/local/share/neofetch/ascii/distro/${ascii/ *}"
elif [[ -f "/data/data/com.termux/files/usr/share/neofetch/ascii/distro/${ascii/ *}" ]]; then
ascii="/data/data/com.termux/files/usr/share/neofetch/ascii/distro/${ascii/ *}"
else else
get_script_dir 2>/dev/null get_script_dir 2>/dev/null
ascii_dir="${script_dir}/ascii/distro"
# If the ascii file doesn't exist fallback to text mode.
if [[ -f "$script_dir/ascii/distro/${ascii/ *}" ]]; then
ascii="$script_dir/ascii/distro/${ascii/ *}"
else
to_off "Ascii: Ascii file not found, falling back to text mode."
return
fi
fi fi
# Remove 'linux' from 'linux mint'.
[[ "$ascii_distro" =~ ^linux ]] && ascii_distro="${ascii_distro/linux }"
# ascii_dir/first_letter (example: 'ascii_dir/m'*)
for art in "${ascii_dir}/${ascii_distro:0:1}"*; do
[[ "$ascii_distro" =~ ${art/*\/} ]] && { ascii="$art"; break; }
done
fi fi
# Set locale to get correct padding. # Set locale to get correct padding.