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

Image: Universal image source

Browse source
This commit is contained in:
Dylan Araps 2017-01-14 21:09:04 +11:00
parent 8d0630afdd
commit 68f8998544
1 changed files with 10 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

21
neofetch
View file

@ -2001,9 +2001,9 @@ image_backend() {
} }
get_ascii() { get_ascii() {
if [[ ! -f "$ascii" || "$ascii" == "distro" ]]; then if [[ ! -f "$image_source" || "$image_source" == "distro" ]]; then
# Fallback to distro ascii mode if custom ascii isn't found. # Fallback to distro ascii mode if custom ascii isn't found.
[[ "$ascii" != "distro" && ! -f "$ascii" ]] && \ [[ "$image_source" != "distro" && ! -f "$image_source" ]] && \
err "Ascii: Ascii file not found, using distro ascii." err "Ascii: Ascii file not found, using distro ascii."
if [[ -d "/usr/share/neofetch/ascii/distro" ]]; then if [[ -d "/usr/share/neofetch/ascii/distro" ]]; then
@ -2020,10 +2020,10 @@ get_ascii() {
ascii_dir="${script_dir}/ascii/distro" ascii_dir="${script_dir}/ascii/distro"
fi fi
ascii="${ascii_dir}/${ascii_file}" image_source="${ascii_dir}/${ascii_file}"
# Fallback to no ascii mode if distro ascii isn't found. # Fallback to no ascii mode if distro ascii isn't found.
[[ ! -f "$ascii" ]] && \ [[ ! -f "$image_source" ]] && \
{ to_off "Ascii: Failed to find distro ascii, falling back to no ascii mode."; return; } { to_off "Ascii: Failed to find distro ascii, falling back to no ascii mode."; return; }
fi fi
@ -2039,7 +2039,7 @@ get_ascii() {
line="${line//\\\\/\\}" line="${line//\\\\/\\}"
((${#line} > ascii_length)) && ascii_length="${#line}" ((${#line} > ascii_length)) && ascii_length="${#line}"
((++lines)) ((++lines))
done < "$ascii" done < "$image_source"
# Colors. # Colors.
print="${print//'${c1}'/$c1}" print="${print//'${c1}'/$c1}"
@ -2073,6 +2073,8 @@ get_image_source() {
fi fi
;; ;;
esac esac
err "Image: Using image $image"
} }
get_wallpaper() { get_wallpaper() {
@ -3896,11 +3898,8 @@ get_args() {
"--disk_display") disk_display="$2" ;; "--disk_display") disk_display="$2" ;;
# Image # Image
"--image") "--image_backend") image_backend="$2" ;;
image_source="$2" "--image_source") image_source="$2" ;;
case "$2" in "-"* | "" | "ascii") image_backend="ascii" ;; esac
;;
"--image_size" | "--size") image_size="$2" ;; "--image_size" | "--size") image_size="$2" ;;
"--crop_mode") crop_mode="$2" ;; "--crop_mode") crop_mode="$2" ;;
"--crop_offset") crop_offset="$2" ;; "--crop_offset") crop_offset="$2" ;;
@ -4002,7 +4001,7 @@ main() {
# w3m-img: Draw the image a second time to fix # w3m-img: Draw the image a second time to fix
# rendering issues in specific terminal emulators. # rendering issues in specific terminal emulators.
[[ "$image_backend" == "image" && "$image_program" == "w3m" ]] && display_image [[ "$image_program" == "w3m-img" ]] && display_image
# Take a screenshot. # Take a screenshot.
[[ "$scrot" == "on" ]] && take_scrot [[ "$scrot" == "on" ]] && take_scrot