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

Merge branch 'master' of github.com:dylanaraps/neofetch

This commit is contained in:
Dylan Araps 2017-07-31 22:31:49 +10:00
parent e52b01f2dc fde69ea812
commit 2429cb862d
2 changed files with 16 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
CHANGELOG.md
View File

@ -24,6 +24,8 @@
## Images ## Images
- [w3m] Fixed w3m-img not found on NixOS. - [w3m] Fixed w3m-img not found on NixOS.
- Added support for using all image types as input.
- Neofetch now supports `svg`, `tiff` etc.
## ASCII ## ASCII

25
neofetch
View File

@ -1701,7 +1701,7 @@ get_term() {
case "${name// }" in case "${name// }" in
"${SHELL/*\/}" | *"sh" | "tmux"* | "screen" | "su"*) ;; "${SHELL/*\/}" | *"sh" | "tmux"* | "screen" | "su"*) ;;
"login"* | *"Login"* | "init" | "(init)") term="$(tty)" ;; "login"* | *"Login"* | "init" | "(init)") term="$(tty)" ;;
"ruby" | "1" | "systemd" | "sshd"* | "python"* | "USER"*"PID"*) break ;; "ruby" | "1" | "systemd" | "sshd"* | "python"* | "USER"*"PID"* | "kdeinit"*) break ;;
"gnome-terminal-") term="gnome-terminal" ;; "gnome-terminal-") term="gnome-terminal" ;;
*"nvim") term="Neovim Terminal" ;; *"nvim") term="Neovim Terminal" ;;
*"NeoVimServer"*) term="VimR Terminal" ;; *"NeoVimServer"*) term="VimR Terminal" ;;
@ -2277,7 +2277,7 @@ get_image_source() {
if [[ -d "$image_source" ]]; then if [[ -d "$image_source" ]]; then
shopt -s nullglob shopt -s nullglob
files=("${image_source%/}"/*.{png,jpg,jpeg,jpe,gif}) files=("${image_source%/}"/*.{png,jpg,jpeg,jpe,gif,svg})
shopt -u nullglob shopt -u nullglob
image="${files[RANDOM % ${#files[@]}]}" image="${files[RANDOM % ${#files[@]}]}"
@ -2497,13 +2497,13 @@ get_image_size() {
make_thumbnail() { make_thumbnail() {
# Name the thumbnail using variables so we can # Name the thumbnail using variables so we can
# use it later. # use it later.
image_name="$crop_mode-$crop_offset-$width-$height" image_name="$crop_mode-$crop_offset-$width-$height-${image//'/'/_}"
# Check to see if the image has a file extension, # Handle file extensions.
# if it doesn't then add one. case "${image##*.}" in
case "${image##*/}" in "eps"|"pdf"|"svg"|"gif"|"png")
*"."*) image_name="${image_name}-${image##*/}" ;; image_name+=".png" ;;
*) image_name="${image_name}-${image##*/}.jpg" ;; *) image_name+=".jpg" ;;
esac esac
# Create the thumbnail dir if it doesn't exist. # Create the thumbnail dir if it doesn't exist.
@ -2530,6 +2530,7 @@ make_thumbnail() {
-format "%[pixel:p{0,0}]" info:)" -format "%[pixel:p{0,0}]" info:)"
convert \ convert \
-background none \
"$image" \ "$image" \
-trim +repage \ -trim +repage \
-gravity south \ -gravity south \
@ -2541,6 +2542,7 @@ make_thumbnail() {
"fill") "fill")
convert \ convert \
-background none \
"$image" \ "$image" \
-trim +repage \ -trim +repage \
-scale "$width"x"$height"^ \ -scale "$width"x"$height"^ \
@ -2551,6 +2553,7 @@ make_thumbnail() {
"none") cp "$image" "$thumbnail_dir/$image_name" ;; "none") cp "$image" "$thumbnail_dir/$image_name" ;;
*) *)
convert \ convert \
-background none \
"$image" \ "$image" \
-gravity "$crop_offset" \ -gravity "$crop_offset" \
-crop "$size"x"$size"+0+0 \ -crop "$size"x"$size"+0+0 \
@ -2702,12 +2705,12 @@ scrot_program() {
if [[ "$scrot_cmd" != "auto" ]] && type -p "$scrot_cmd" >/dev/null; then if [[ "$scrot_cmd" != "auto" ]] && type -p "$scrot_cmd" >/dev/null; then
scrot_program=("$scrot_cmd") scrot_program=("$scrot_cmd")
elif type -p scrot >/dev/null; then
scrot_program=(scrot)
elif type -p maim >/dev/null; then elif type -p maim >/dev/null; then
scrot_program=(maim) scrot_program=(maim)
elif type -p scrot >/dev/null; then
scrot_program=(scrot)
elif type -p import >/dev/null && [[ "$os" != "Mac OS X" ]]; then elif type -p import >/dev/null && [[ "$os" != "Mac OS X" ]]; then
scrot_program=(import -window root) scrot_program=(import -window root)