Commit Graph

1343 Commits

Author SHA1 Message Date
Muhammad Herdiansyah 1fa37fa274 ASCII: Added Korora 2016-11-04 19:33:16 +07:00
Dylan Araps 7fbe91e8e8 General: Fix issue with no info printed if whitespace was in the output 2016-11-04 20:09:27 +11:00
Dylan Araps edfdbf05a4 Merge pull request #406 from dylanaraps/distro3
Distro: [Linux] Source *ease files
2016-11-04 18:56:36 +11:00
Dylan Araps 564b0f889e Docs: Change version 2016-11-04 18:45:02 +11:00
Dylan Araps e912d35b34 Remove --test 2016-11-04 17:42:32 +11:00
Dylan Araps 5585eaa8b8 General: If something can't be detected let the user know in verbose mode 2016-11-04 14:49:50 +11:00
Dylan Araps 4cea604b86 Termfont: Simpler awk commands 2016-11-04 13:44:37 +11:00
Dylan Araps 3a0c82ebc5 Merge branch 'master' of https://github.com/dylanaraps/neofetch 2016-11-03 11:14:59 +11:00
Dylan Araps 2b3940adb9 Memory: [OpenBSD] Fix OpenBSD memory usage - @Head-on-a-Stick (Closes #413) 2016-11-03 11:14:34 +11:00
Fredrik Fornwall 7ebd6dacba Android (Termux): Fix default config location 2016-11-02 16:18:45 +01:00
Dylan Araps bd0dd91973 General: Add support for BlankOn Linux 2016-11-02 17:40:50 +11:00
Dylan Araps ba4b541167 Image: Fix cursor position in URxvt when using terminal padding 2016-11-02 17:17:09 +11:00
Dylan Araps 5cede165cf WM Theme: Use double quotes 2016-11-02 15:56:00 +11:00
Dylan Araps e8ab7ea88d Remove stray newline 2016-11-02 15:49:52 +11:00
Dylan Araps 2705f23248 Merge branch 'master' of https://github.com/dylanaraps/neofetch 2016-11-02 14:41:57 +11:00
Dylan Araps 0c28f8c3f6 WM Theme: Don't print Mutter (Budgie) wm theme 2016-11-02 14:41:39 +11:00
Dylan Araps a687096bc2 Merge pull request #411 from konimex/master
Various updates for Android/Termux
2016-11-02 13:29:29 +11:00
Herdiansyah ebf5f6345a Android (Termux): Fixed ASCII not appearing 2016-11-02 08:21:15 +07:00
Dylan Araps 651d38c949 Theme: Misc fixes 2016-11-02 10:16:16 +11:00
Dylan Araps 1505ed5d68 Theme: [Budgie] Fix incorrect GTK Theme/Icons 2016-11-02 10:10:40 +11:00
Dylan Araps 013e9d6652 Termfont: [Linux] Fix whitespace issue 2016-11-02 09:52:46 +11:00
Dylan Araps 453a38d79f Images: Fix Division by 0 error. Closes #410 2016-11-02 09:44:25 +11:00
Dylan Araps 7b2dcea117 Termfont: [Termite] Fix incorrect font choses. Closes #409 2016-11-02 09:39:37 +11:00
Dylan Araps 462d4c594a prin: Fix bold not working, Add prin tests to travis 2016-11-02 00:54:52 +11:00
Dylan Araps 00f22df3c8 prin: Revert bold fix 2016-11-02 00:41:52 +11:00
Dylan Araps 6ada4c7fb8 prin: Fix bold not working, Fix color breakage. Closes #407 2016-11-02 00:37:54 +11:00
Dylan Araps e0fff44cce Distro: [Linux] Fallback only print first line 2016-11-01 23:23:11 +11:00
Dylan Araps dcdf6190c8 Distro: [Linux] Fix incorrect quoting 2016-11-01 23:09:21 +11:00
Dylan Araps b1b6226189 Distro: [Linux] Fix fallbacks not working 2016-11-01 23:05:30 +11:00
Dylan Araps 29ccbb2a31 Remove stray line 2016-11-01 23:00:14 +11:00
Dylan Araps d45002ca15 Distro: [Linux] Also look in /usr/lib/*ease 2016-11-01 22:47:27 +11:00
Dylan Araps f8f50f6b1d Distro: [Linux] Source /etc/*ease files 2016-11-01 22:43:22 +11:00
Dylan Araps a37a3eec31 Update docs 2016-11-01 17:57:08 +11:00
Dylan Araps 921f0975f1 General: Red Star OS fixes 2016-11-01 11:43:06 +11:00
Kim Myung-ki 85eef19406 레드 스타 OS에 대한 도움 탐지
친애하는 지도자 김정일의 위대한 후계자가 김정은이 프로그램 neofetch에
영광스러운 붉은 별의 검출을 추가 요구했다, 당신은 더 나은 자신의
명령을주의 나 기회가 될!

Signed-off-by: Korea Computer Center <admin@kcc.net.kp>
2016-10-31 23:22:51 +07:00
Muhammad Herdiansyah c47d095a38 Expanded distro_shorthand to *BSDs 2016-10-31 20:47:32 +07:00
Dylan Araps dcf51866ec Merge branch 'master' of https://github.com/dylanaraps/neofetch 2016-10-31 14:57:22 +11:00
Dylan Araps 194c7b500d Images: Use \033[14t before falling back to external programs 2016-10-31 14:57:04 +11:00
Muhammad Herdiansyah 2f46385cf0 GPU: Used FreeBSD's method for DragonFlyBSD and PacBSD 2016-10-30 23:40:52 +07:00
Dylan Araps e408e6f8d7 Kernel: Remove kernel_shorthand tiny 2016-10-30 20:55:14 +11:00
Dylan Araps c667fca505 Kernel: Hardcode kernel_shorthand=tiny on BSD systems 2016-10-30 17:40:43 +11:00
Dylan Araps 5959cb1b93 Image: If terminal size is less than or equal to 10 fallback to ascii mode 2016-10-30 14:20:01 +11:00
Dylan Araps 0be5f01291 Image: If terminal width is 0, fallback to ascii mode 2016-10-30 14:08:48 +11:00
Dylan Araps 0a2c9a5a6b Misc: Don't uppercase Terminal and WM output 2016-10-29 16:50:48 +11:00
Dylan Araps ec0ed23d11 Term: Add a fallback to ps. 2016-10-29 16:02:24 +11:00
Dylan Araps a06329db1b getterm: Use /proc/$PPID/comm instead of ps 2016-10-29 15:19:04 +11:00
Dylan Araps 7c327683a8 Kernel: Print kernel name by default 2016-10-29 14:33:36 +11:00
Dylan Araps 0871c362ef Windows 10 (bash): Fix battery 2 2016-10-29 11:47:00 +11:00
Dylan Araps 7735fb02a5 Windows 10 (bash): Fix battery usage 2016-10-29 11:41:50 +11:00
Dylan Araps 63198a2209 Uptime: Remove 'up' 2016-10-27 09:45:55 +11:00
Dylan Araps 51354b2235 Merge pull request #322 from dylanaraps/android2
Add Android support 2
2016-10-27 09:30:23 +11:00
Dylan Araps b8502a8b44 Ascii: Fix colors on light terminals 2016-10-27 08:20:20 +11:00
Dylan Araps e8e859b590 Merge master 2016-10-27 08:09:08 +11:00
Dylan Araps 785a22520b Merge pull request #398 from dylanaraps/gpu
GPU: [Linux] Rewrite GPU
2016-10-26 23:50:57 +11:00
Dylan Araps 64b8e02812 Fix 2016-10-26 23:50:54 +11:00
Dylan Araps 8cbf7e7feb Remove GPU shorthand 2016-10-26 23:41:17 +11:00
Dylan Araps 4e7955bc94 Cache GPU output 2016-10-26 23:22:08 +11:00
Dylan Araps b2d17711f9 GPU: Add brand 2016-10-26 23:16:57 +11:00
Dylan Araps 0177837f69 GPU: Start rewrite 2016-10-26 22:48:20 +11:00
Dylan Araps eee8ac7f8e Merge pull request #396 from dylanaraps/song
Song: Rewrite song function
2016-10-26 21:20:05 +11:00
Dylan Araps 6f41167eb5 Song: Fix iTunes 2 2016-10-26 21:18:46 +11:00
Dylan Araps 9889ba14cb Song: Fix iTunes 2016-10-26 21:04:58 +11:00
Dylan Araps 314c254794 Docs: misc 2016-10-26 18:24:37 +11:00
Dylan Araps bf67d5be11 Docs: Remove battery options 2016-10-26 18:23:15 +11:00
Dylan Araps 43ac9dfcb2 Docs 2016-10-26 18:22:08 +11:00
Dylan Araps 0c41c285a7 Fix processes with paths in name' 2016-10-26 18:09:59 +11:00
Dylan Araps b23ccd6709 Battery: [Linux] Rewrite battery 2016-10-26 17:56:50 +11:00
Dylan Araps 931660d31a Remove pointless if
"
2016-10-26 15:38:45 +11:00
Dylan Araps efa55b28b0 Rewrite getsong 2016-10-26 15:18:11 +11:00
Dylan Araps 252d56ab49 Reduce sise of iOS GPU function 2016-10-26 11:29:46 +11:00
Dylan Araps fa312af1ee Misc fixes/changes 2016-10-26 11:18:37 +11:00
Dylan Araps cc9095ccd5 Refactor GPU 2016-10-25 10:39:56 +11:00
Dylan Araps ab1de702f9 Distro: Simplify shorthand for lsb_release 2016-10-25 10:30:41 +11:00
Dylan Araps 192014ca9f Model: Remove useless use of cat 2016-10-25 10:25:10 +11:00
Muhammad Herdiansyah e92e691751 SUSE: Changed ASCII behavior
In SUSE's `lsb_release`, they have different behavior for `-ir` and
`-d`, one output will be `openSUSE Leap 42.1` and the other will be
`SUSE LINUX 42.1`. This new behavior would also extend compatibility
with SUSE Linux Enterprise.
2016-10-24 22:09:57 +07:00
Dylan Araps c869e81e3b Fix w3m-img being used even when images were off 2016-10-24 08:53:54 +11:00
Muhammad Herdiansyah 24e7216777 Solaris: Strip out crap from getdistro output 2016-10-23 18:51:12 +07:00
Muhammad Herdiansyah d39bebb2a4 Solaris: Unified package detection with Linux
Some OpenSolaris/illumos-based distribution used various Linux package
managers such as dpkg, rpm, and portage (see more at
http://wiki.illumos.org/display/illumos/Distributions). It would make
sense for Solaris' case to be unified with Linux.

However, Linux's `pkg` detection (I don't know which distro is that) are
vastly different from Oracle Solaris/OpenIndiana's `pkg`, so a
workaround is used.
2016-10-23 18:51:04 +07:00
Dylan Araps 09a4ac132e Simplify cursor positioning 2016-10-23 14:08:45 +11:00
Dylan Araps d09cf58790 Cursor Position: Fix issues when using URxvt+Padding 2016-10-23 13:47:49 +11:00
Dylan Araps 5dddaa0b26 GPU: Remove duplicate substitutions 2016-10-23 11:22:17 +11:00
Dylan Araps f4b266b5c6 CPU Speed: Don't use read 2016-10-23 11:13:40 +11:00
Dylan Araps 49cdb2f95c Linux: Correctly calculate memory usage 2016-10-23 11:03:46 +11:00
Dylan Araps 664556d137 Test mode: Show CPU temp 2016-10-23 09:51:16 +11:00
Dylan Araps 3ef6aeea42 Linux: Add CPU temperature 2016-10-23 09:45:03 +11:00
Dylan Araps 6457b3276f Windows: Print DE 2016-10-23 09:07:04 +11:00
Dylan Araps a59cf169e4 Cmus: Fix broken output, closes #389 2016-10-22 23:14:54 +11:00
Dylan Araps fe8e15d5d6 Simplify cursor position 2016-10-22 20:25:41 +11:00
Dylan Araps 17d17f4480 Theme: Fix gtk2/3 comparison when whitespace is involved 2016-10-22 19:59:25 +11:00
Dylan Araps 919da27716 Added support for Porteus, closes #388 2016-10-22 15:19:56 +11:00
Dylan Araps 0fb2b661ba Song: Add support for Audacious. @ncmprhnsbl 2016-10-22 15:11:52 +11:00
Dylan Araps 92595e8bc6 Fix cursor artifacts in termux 2016-10-22 10:20:14 +11:00
Dylan Araps ad3a90219a Fix cursor artifcats in termux 2016-10-22 10:18:38 +11:00
Dylan Araps fd957835b7 Merge branch 'master' into android2 2016-10-22 10:16:10 +11:00
Dylan Araps 79392d75a9 Sigh 2016-10-22 10:15:47 +11:00
Dylan Araps d1ef3ab4e8 Merge branch 'master' into android2 2016-10-22 10:11:38 +11:00
Dylan Araps ad2b18ef07 Count line breaks when calculating cursor position 2016-10-22 10:11:18 +11:00
Dylan Araps 8bc6b2d183 Merge branch 'master' into android2 2016-10-22 09:52:26 +11:00
Dylan Araps 50f87a4233 Fix cursor bugs if ascii art is taller than info 2016-10-22 09:51:58 +11:00
Dylan Araps 0b5d25d9b5 Fix cursor bugs if ascii art is taller than info 2016-10-22 09:49:59 +11:00
Dylan Araps bb01418dca Merge master 2016-10-22 01:39:31 +11:00
Dylan Araps a34d64b43b Revert color blocks change as it caused issues in tty 2016-10-22 01:35:28 +11:00
Dylan Araps bcb51ee7aa Add more deprecated flags to checkoldflags() 2016-10-22 01:27:39 +11:00
Dylan Araps 60beb88def w3m-img: Add -bg support 2016-10-22 01:14:02 +11:00
Dylan Araps b12e5b1f56 Fix yoffset bug 2016-10-22 01:05:47 +11:00
Dylan Araps a564b19aeb Fix cursor bugs and use yoffset in calculations 2016-10-22 00:42:34 +11:00
Dylan Araps 76f7b4025e w3m-img: Draw the image twice 2016-10-22 00:06:51 +11:00
Dylan Araps 5270e97943 Merge branch 'master' into img 2016-10-22 00:03:05 +11:00
Dylan Araps d9e15e3597 Merge pull request #380 from dylanaraps/uptime-fix
Rewrite uptime for Linux/Windows/Solaris to match macOS/BSD
2016-10-21 23:45:25 +11:00
Dylan Araps 6c50efa75b term: Don't print output of busybox ps 2016-10-21 21:48:17 +11:00
Dylan Araps 4619eba654 Don't do any dynamic prompt stuff in image off mode 2016-10-21 21:45:32 +11:00
Dylan Araps 6a37a9bb11 Merge pull request #381 from dylanaraps/cores
Add option to hide/show hyperthreaded cpu cores.
2016-10-21 21:35:00 +11:00
Dylan Araps c804f7835e Image mode: Add support for terminal emulators that don't support \033[14t 2016-10-21 21:25:43 +11:00
Muhammad Herdiansyah e4c7f1926a Solaris: Rewritten uptime
Solaris' uptime will now show the second mark only so we don't have 2
case instances.
2016-10-21 16:29:31 +07:00
Dylan Araps 3123548c18 Update docs 2016-10-21 20:29:16 +11:00
Dylan Araps 9882165617 Add support for Solaris 2016-10-21 20:27:35 +11:00
Dylan Araps 7b62b8091c revert old logo 2016-10-21 19:01:25 +11:00
Dylan Araps edb6920df9 New android logo 2016-10-21 18:54:37 +11:00
Dylan Araps 5f4e9e5d8e merge master 2016-10-21 18:42:25 +11:00
Dylan Araps e11d40cd00 solaris: Fix term 2016-10-21 18:37:59 +11:00
Dylan Araps ad47e456e3 Fix term on solaris 2016-10-21 18:36:32 +11:00
Dylan Araps 5a96327fa3 Only use zero width space in image mode 2016-10-21 18:35:17 +11:00
Dylan Araps 6e47608bc5 Don't do any dynamic prompt stuff in image off mode 2016-10-21 18:09:25 +11:00
Dylan Araps b13da1d999 Fix C locale padding issues 2016-10-21 18:02:04 +11:00
Dylan Araps 7bdf5f1168 Fix bug with block chars 2016-10-21 17:19:03 +11:00
Dylan Araps 93abca7185 Make note about support 2016-10-21 16:54:05 +11:00
Dylan Araps bd44f1ea12 Fix grammar error 2016-10-21 16:40:58 +11:00
Dylan Araps 66100fc351 Use cpu_cores 2016-10-21 16:38:02 +11:00
Dylan Araps dc32c0b71c Add option to hide/show hypertheaded cpu cores 2016-10-21 16:26:34 +11:00
Dylan Araps 1a8734bf46 macOS: Show hyperthreaded cores 2016-10-21 15:16:02 +11:00
Dylan Araps e5359dc314 Fix terminal output on android 2016-10-21 14:45:36 +11:00
Dylan Araps 99d43ff257 Add seconds when uptime is below 1 min 2016-10-21 10:37:40 +11:00
Dylan Araps c2e6f6534d Fix errors on large uptimes 2016-10-21 10:20:28 +11:00
Dylan Araps fb7b3c146e Rewrite uptime 2016-10-21 10:00:09 +11:00
Dylan Araps 7862e3af5a Fix bugs 2016-10-21 09:15:03 +11:00
Dylan Araps 7a661b3966 Fix bugs 2016-10-20 17:32:29 +11:00
Dylan Araps 0e87355eb0 merge master 2016-10-19 20:54:30 +11:00
Dylan Araps d1b2b2828f Remove path from terminal name 2016-10-18 08:23:03 +11:00
Dylan Araps 805b7d2e84 Fix bug 2016-10-17 23:59:54 +11:00
Dylan Araps 2abdbfc2bc Condense osx_version 2016-10-17 23:48:30 +11:00
Dylan Araps 03e6e8c992 Fix 2016-10-17 19:55:41 +11:00
Dylan Araps 20de28779d Fix 2016-10-17 19:52:31 +11:00
Dylan Araps a76bd6b913 Fix 2016-10-17 19:51:00 +11:00
Dylan Araps 2a4f82a317 Show bbLean instead of Blackbox 2016-10-17 19:47:48 +11:00
Dylan Araps 14bba15f9a Show explorer theme for other Wms/Shells 2016-10-17 19:22:15 +11:00
Dylan Araps 1799ad84b8 Fix path errors 2016-10-17 19:15:42 +11:00
Dylan Araps 1136ca820c Fix path errors 2016-10-17 19:14:19 +11:00
Dylan Araps 3ab1b9326b wmtheme: Add support for Blackbox 2016-10-17 19:02:53 +11:00
Dylan Araps 2d9dbaa4bb Merge pull request #373 from dylanaraps/winwm
wm: Add support for Windows WMs and Shells
2016-10-17 18:45:07 +11:00
Dylan Araps 4be66e94bd wm: Add support for Windows WMs and Shells 2016-10-17 18:39:56 +11:00
Andrew Titmuss 21144eb973
fix iTunes automatically opening 2016-10-17 16:53:30 +11:00
Dylan Araps 71ece3de5b Fix disk output on MacOS 2016-10-17 08:07:04 +11:00
Dylan Araps 48819dc592 Fix glitched line endings on long lines 2016-10-17 00:07:30 +11:00
coypoop 04685755c1 physmem is 32bit on netbsd, physmem64 for 64bit 2016-10-16 09:01:16 +03:00
Muhammad Herdiansyah 294b5f34e7 Added support for Bitrig 2016-10-16 09:50:22 +07:00
Dylan Araps f275d53fa6 Fix broken block_width 2016-10-16 10:44:05 +11:00
Dylan Araps a9f74d9d01 Add support for Sparky Linux 2016-10-16 09:38:56 +11:00
Andrew Titmuss 2010d11328
shorten if statement for retina check 2016-10-16 00:45:27 +11:00
Andrew Titmuss 52e0884250
remove test from if statement 2016-10-16 00:43:20 +11:00
Andrew Titmuss 6f004a244f
macOS: add @2x label for retina resolutions 2016-10-16 00:39:07 +11:00
Dylan Araps 084541fe34 Merge pull request #364 from iandrewt/hyperthreading-fix
fix macOS to show physical cores
2016-10-15 23:56:41 +11:00
Andrew Titmuss 85d1c31dce
change all references to Mac OS X to macOS 2016-10-15 23:20:25 +11:00
Andrew Titmuss 50a2bdcc95
fix macOS to show physical cores 2016-10-15 22:57:45 +11:00
Dylan Araps 5e167e4c02 Uppercase without function 2016-10-15 22:07:12 +11:00
Dylan Araps 30d808c52d Fix function in bash 3 2016-10-15 22:01:15 +11:00
Dylan Araps a8ccdf6a65 Uppercase first letter of info 2016-10-15 21:45:19 +11:00
Muhammad Herdiansyah 710fd49887 Added function to check if old flags is still present on configs 2016-10-15 13:19:52 +07:00
Muhammad Herdiansyah fe6588d8b6 Expanded distro_shorthand to Solaris 2016-10-15 13:19:52 +07:00
Muhammad Herdiansyah ed41c15c6a Expanded distro_shorthand to Mac OS X 2016-10-15 13:19:49 +07:00
Dylan Araps cce254d338 Fix incorrect font name on XFCE 2016-10-13 23:47:35 +11:00
Dylan Araps 3e9c3d648c Fixed rendering issues with URxvt and XFT fonts, thanks Konimex 2016-10-12 21:19:40 +11:00
Dylan Araps ee3630af40 Fix image off prompt location 2016-10-12 17:55:51 +11:00
Muhammad Herdiansyah b7256fb48a Removed "Windows" from os_arch description.
To preserve accuracy, os_arch's description will be changed accordingly
so there will be no notion that os_arch is Windows' exclusive.
2016-10-07 17:44:39 +07:00
Muhammad Herdiansyah aa7e185d17 Solaris: Better awk without gsub 2016-10-05 22:06:54 +07:00
Dylan Araps e86ce55822 GPU: Cleanup substitutions 2016-10-05 09:29:54 +11:00
Dylan Araps abf9b5d257 Fix incorrect cursor position when using small ascii art 2016-10-05 08:15:20 +11:00
Dylan Araps 7f5f05b441 Remove stray line 2016-10-04 21:30:03 +11:00
Dylan Araps 934b08b6f8 Re-add w3m-img line wrap fix 2016-10-04 21:29:06 +11:00
Dylan Araps be2d486c41 Fix broken progress bars 2016-10-04 09:43:51 +11:00
Dylan Araps 8ea306652d Fix issues with single args 2016-10-04 08:48:33 +11:00
Dylan Araps 06281daed8 Fix merge conflicts 2016-10-04 08:39:00 +11:00
Dylan Araps dfb8a94303 Finish documentation for scrot upload 2016-10-04 08:26:31 +11:00
Dylan Araps e9a08a074d Merge pull request #349 from dylanaraps/img-fix
Add a tiny sleep to fix image flashing and not drawing properly
2016-10-04 07:55:18 +11:00
Dylan Araps 31ae13d296 Merge pull request #350 from dylanaraps/logo-mode
Logo mode - Only print ascii art.
2016-10-03 21:51:56 +11:00
Dylan Araps 598056b4a1 Logo mode documentation 2016-10-03 21:51:42 +11:00
Dylan Araps 9a0aa9938a Fix weird prompt issues 2016-10-03 21:47:29 +11:00
Dylan Araps 83fd93e4fb Add new mode which only prints the ascii art 2016-10-03 20:53:08 +11:00
Dylan Araps 8a1eb28987 Add --image_size as an alias to --size 2016-10-03 18:13:16 +11:00
Dylan Araps b33cf57c16 Remove useless block 2016-10-03 18:11:00 +11:00
Dylan Araps 83acc08ae1 Add comment explaining fix 2016-10-03 18:08:47 +11:00
Dylan Araps a3e65eb120 Add a tiny sleep to fix image flashing and not drawing properly 2016-10-03 17:59:56 +11:00
Dylan Araps 22ae5a5bba Term: better handling of tmux 2016-10-03 17:20:20 +11:00
Dylan Araps e31e9a400e Term Font (Termite): Ignore comments 2016-10-03 17:09:01 +11:00
Dylan Araps 830cf0ec3b Wallpaper: Replace %20 with space 2016-10-03 10:03:41 +11:00
Dylan Araps cc520e42b6 Move scrot args to a separate function 2016-10-02 23:58:08 +11:00
Dylan Araps 3eebc07f2a better arg handling 2016-10-02 23:51:59 +11:00
Dylan Araps d656639728 Fix quotes 2016-10-02 23:46:22 +11:00
Dylan Araps 83dcdb42f4 Add args to --upload and --su 2016-10-02 22:49:30 +11:00
Dylan Araps c08fc74607 Add error handling 2016-10-02 22:46:51 +11:00
Dylan Araps 64693058a7 Check that curl is installed before attempting to upload anything 2016-10-02 22:03:17 +11:00
Dylan Araps fb3cd92b96 Added support for imgur using my own api key 2016-10-02 21:57:52 +11:00
Dylan Araps 194d37df09 Fix missing battery bug 2016-10-02 20:45:56 +11:00
Dylan Araps 4bd83edf8f Added flag for image host 2016-10-02 20:28:35 +11:00
Dylan Araps 94cbd6bb02 Added working teknik support and new flags 2016-10-02 20:23:02 +11:00
Dylan Araps 269e903e64 Fix teknik 2016-10-02 19:51:44 +11:00
Dylan Araps 20490a53e3 Fix GNOME showing wrong wm theme 2016-10-02 19:30:56 +11:00
Dylan Araps 56997e6bc3 initial support 2016-10-02 19:29:13 +11:00
Dylan Araps 9b411604e0 DE: Add cinnamon version 2016-10-02 18:51:34 +11:00
Dylan Araps 46b4920a9c Remove stray newline 2016-10-02 18:29:42 +11:00
Dylan Araps 26fe57d376 Add gpu_brand to enable/disable gpu brand in output 2016-10-02 18:26:50 +11:00
Dylan Araps b60f281119 Update version 2016-10-02 14:17:51 +11:00
Dylan Araps dcceeb7a13 Merge pull request #339 from dylanaraps/promptfix
Don't clear the screen in 'Ascii' and 'No Image' modes. Fixes #335
2016-10-02 13:43:26 +11:00
Muhammad Herdiansyah 461c826b70 Fixed various indentation 2016-10-02 09:12:48 +07:00
Dylan Araps 75a7d2c1b4 swap case for ifs 2016-10-02 12:23:12 +11:00
Dylan Araps 6ede242b1c Fix blank model output on Windows 2016-10-02 12:01:22 +11:00
Dylan Araps e590ddc10f Fix blank oem info on Windows 2016-10-02 11:58:28 +11:00
Dylan Araps d77bbd9619 Fix empty cpu speed on windows 2016-10-02 11:40:00 +11:00
Dylan Araps 515f5e0fe6 Fix ascii color 2016-10-02 11:33:31 +11:00
Dylan Araps be9fadf7c4 Fix ascii colors on Windows 10 2016-10-02 11:27:24 +11:00
Dylan Araps 8f822c9366 Merge pull request #334 from konimex/subsystem
Initial support for Windows 10 Linux subsystem
2016-10-02 10:19:36 +11:00
undrskr 59a7120196 Change the ascii colors for Solus 2016-10-01 18:16:10 +03:00
Muhammad Herdiansyah 3dff1947b5 Initial support for Windows 10 Linux subsystem 2016-10-01 18:00:32 +07:00
Dylan Araps 070843d2bf Clear screen later 2016-10-01 12:57:54 +10:00
Dylan Araps 2b7ff346db Fix garbage in prompt 2016-10-01 12:55:31 +10:00
Dylan Araps b112ac9715 Cleanup 2016-10-01 12:33:30 +10:00
Dylan Araps 70fa77b64b Faster math 2016-10-01 12:30:59 +10:00
Dylan Araps 402abf90a8 Remove cursor pos line 2016-10-01 12:28:21 +10:00
Dylan Araps 823cce5893 Add comments 2016-10-01 11:42:18 +10:00
Dylan Araps c4e881c9f1 No longer clear screen 2016-10-01 11:35:23 +10:00
Dylan Araps 580b5fd3f0 Neofetch no longer clears the screen in ascii/off modes 2016-10-01 11:12:29 +10:00
Dylan Araps 8f9b320e99 Merge branch 'master' of https://github.com/dylanaraps/neofetch 2016-10-01 10:50:12 +10:00
Dylan Araps 534ffd671c Fix typo 2016-10-01 10:49:56 +10:00
Dylan Araps 79b8ad83bc Fix #336 2016-10-01 10:35:52 +10:00
Muhammad Herdiansyah 42048570d4 Added support for deadbeef 2016-09-11 23:37:23 +07:00
Muhammad Herdiansyah 7a7e7aeb1f Added support for Amarok 2016-09-07 23:33:05 +07:00
Muhammad Herdiansyah fb4638f1af Added support for Banshee Music Player 2016-09-07 22:10:13 +07:00
Muhammad Herdiansyah 8c459ba781 Added support for Rhythmbox Music Player 2016-09-07 22:07:51 +07:00
Muhammad Herdiansyah f45951a147 Fixed percent not displaying in cpu_display 2016-09-03 14:46:59 +07:00
Dylan Araps d1bab99b00 Merge pull request #327 from konimex/distro_shorthand
Expanded distro_shorthand to support non-LSB solutions
2016-09-03 02:17:42 +10:00
Muhammad Herdiansyah e51f6cf836 OpenBSD's battery status get back into the BSD case
Maybe the original commiter forgot the * so s/he decided to get OpenBSD's
case nest into the `$os` instead of `$distro`.

I suspect the original reason that because OpenBSD's `$distro` output
is `OpenBSD $(uname -m)` instead of just `OpenBSD` so the results didn't
appear.

Anyway, for consistency, I decided to bring OpenBSD's battery case back
to the `$distro` case, add a very little fix (which is the *) and the
problem should be fixed.
2016-09-02 21:12:02 +07:00
Muhammad Herdiansyah e2af2772fe Expanded distro_shorthand to support non-LSB solutions 2016-09-01 20:28:57 +07:00
Muhammad Herdiansyah 444c860e61 Fixed Android uptime 2016-08-30 23:13:59 +07:00
Dylan Araps 0a56836343 Merge pull request #323 from konimex/lsb
Added distro_shorthand to simplify lsb_release output
2016-08-30 19:53:26 +10:00
Muhammad Herdiansyah 7372e56d50 Added distro_shorthand to simplify lsb_release output 2016-08-30 11:18:30 +07:00
Muhammad Herdiansyah b3dcfe820c Changed case 2016-08-30 07:26:13 +07:00
Muhammad Herdiansyah c0b53c0606 Added distro detection 2016-08-29 21:36:57 +07:00
Muhammad Herdiansyah 7889c093b2 Added and changed some Android commands
Included:
- Added model support for Android
- Changed CPU command to use native Android ones
2016-08-29 21:20:46 +07:00
Dylan Araps 26de54e555 Fix new issues 2016-08-29 14:22:10 +10:00
Dylan Araps 0a2fa2b558 Better uptime command that will work accross uptime versions 2016-08-28 12:03:23 +10:00
Dylan Araps bd7ebdfe4b Fix CPU name on android 2016-08-28 11:47:56 +10:00
Dylan Araps 76cc33f95f Fix padding on android 2016-08-28 11:41:27 +10:00
Dylan Araps 5444ecdf6d Fix padding on Android 2016-08-28 10:49:35 +10:00
Dylan Araps 12ba2f925a Add previous PR 2016-08-28 09:03:40 +10:00
Dylan Araps 71f0575b2b Add ascii art and distro detection 2016-08-28 08:59:11 +10:00
Muhammad Herdiansyah 06a3f809cc Added support for GuixSD 2016-08-27 15:42:56 +07:00
Dylan Araps f7353a6b64 Model: Add checks for more files 2016-08-27 08:48:43 +10:00
Dylan Araps 198fa7bcd9 Merge pull request #310 from dylanaraps/model2
Add new `model` function to print device model name
2016-08-26 22:16:12 +10:00
Dylan Araps e3c5bbd8a2 Fix disk on OS X and FreeBSD 2016-08-26 13:03:22 +10:00
Dylan Araps f5bd9a7841 test 2016-08-26 12:28:33 +10:00
Dylan Araps 93715fb4a9 Simplify cpu core 2016-08-26 12:21:32 +10:00
Dylan Araps 5e32fc6461 Openwrt count packages 2016-08-26 12:17:58 +10:00
Dylan Araps 8250f5052a Fix disk usage and user 2016-08-26 12:07:26 +10:00
Dylan Araps d41d805f1a read: Use -s flag instead of stty 2016-08-26 11:27:58 +10:00
Dylan Araps db8aebd216 Swap stty for -s 2016-08-26 11:22:54 +10:00
Dylan Araps e53e82c9c4 Supress prompt erors 2016-08-26 11:15:27 +10:00
Dylan Araps 2dea28ea2a Fix awk bug on openwrt 2016-08-26 11:10:55 +10:00
Dylan Araps ad53cc8bfc OpenWRT uptime 2016-08-26 10:19:05 +10:00
Dylan Araps 377b5a048d Fix distro on openwrt 2016-08-25 22:26:22 +10:00
Dylan Araps c1a867ad22 getcpu: Remove prin usage 2016-08-19 23:05:39 +10:00
Dylan Araps 4420a2cb38 Remove stdout mode 2016-08-19 23:01:18 +10:00
Dylan Araps 595c14a2e4 Fix merge conflicts 2016-08-19 22:47:46 +10:00
Dylan Araps 065b0d21a0 Model (Linux): Use cat to fix issues 2016-08-19 11:25:17 +10:00
Dylan Araps 4b4b0437d9 Also include product name 2016-08-19 11:15:13 +10:00
Dylan Araps 26af24dcc6 Merge branch 'model2' of https://github.com/dylanaraps/neofetch into model2 2016-08-19 10:39:57 +10:00
Dylan Araps a96420e067 Model: Add BSD support 2016-08-19 10:39:12 +10:00
Dylan Araps 81577799c7 Use stty instead of tput 2016-08-19 10:29:27 +10:00
Dylan Araps f4e96993d5 Move functions around 2016-08-19 10:09:35 +10:00
Dylan Araps e254274c24 Cleanup 2016-08-19 10:07:24 +10:00
Dylan Araps e25a48e1f8 Check OS earlier in the script 2016-08-19 10:05:45 +10:00
Dylan Araps fa8a1e82ec Cleanup 2016-08-19 10:03:33 +10:00
Dylan Araps b2ea12d77e Added support for Rosa 2016-08-18 08:10:50 +10:00
Dylan Araps 00215fcbd1 Added OpenWrt ascii art 2016-08-17 10:08:25 +10:00
Muhammad Herdiansyah 346bff1c52 Added Solaris support for model 2016-08-14 17:41:09 +07:00
Dylan Araps 3461b2a029 Model: Added Windows support 2016-08-14 15:23:19 +10:00
Andrew Titmuss 27ebe9a6a7
fixed macOS codename function 2016-08-14 14:33:36 +10:00
Dylan Araps f805623171 Add model to travis test mode 2016-08-14 14:16:25 +10:00
Andrew Titmuss 53d2cf6661
made PR two lines shorter :) 2016-08-14 14:09:28 +10:00
Andrew Titmuss 8d2db93545
added macOS support for model name 2016-08-14 14:01:31 +10:00
Dylan Araps 6b9abdb9d6 Add new model function to print device model name 2016-08-14 13:26:30 +10:00
Dylan Araps 7500bfc757 Remove travis readonly vars 2016-08-14 13:14:18 +10:00
Dylan Araps ba569f78cd Fix config issues 2016-08-14 13:13:21 +10:00
Dylan Araps e0ac5c14c8 Fix broken color blocks on iOS 2016-08-14 11:04:25 +10:00
Dylan Araps 1686dd141b Fix quotes in subtitles on iOS 2016-08-14 10:55:01 +10:00
Dylan Araps ba7ed6280b Fix terminal emulator on iOS over ssh 2016-08-14 10:41:42 +10:00
Dylan Araps f388c222c5 Remove whitespace 2016-08-13 21:39:36 +10:00
Dylan Araps 66749c58ab Move OS detection to a function and cleanup comments 2016-08-13 21:28:23 +10:00
Dylan Araps 256205aaea Move some blocks to separate functions 2016-08-13 19:42:31 +10:00
Dylan Araps 793bcbcc7d Simplify ascii distro auto 2016-08-13 19:28:21 +10:00
Dylan Araps ada00c9bb9 Combine escape sequences 2016-08-13 18:39:06 +10:00
Dylan Araps 7ea4aa2e82 Simplify CPU commands 2016-08-12 23:46:46 +10:00
Dylan Araps bcec8c65da Consistent function brackets 2016-08-12 20:53:04 +10:00
Dylan Araps 7a774dd48d Move the commands near the bottom of the script to a function called main 2016-08-12 20:36:48 +10:00
Dylan Araps 2511511174 Remove stray comment 2016-08-12 17:08:22 +10:00
Dylan Araps cb9e7fac4c Move comment 2016-08-12 17:05:14 +10:00
Dylan Araps d8a1165694 Add missing ascii_distro config option 2016-08-12 16:52:51 +10:00
Dylan Araps 56325786d2 Simplify err 2016-08-12 16:45:36 +10:00
Dylan Araps 9a31740184 Simplify default config 2016-08-12 11:38:32 +10:00
Dylan Araps 1b336f912e Added verbose messages for confog sourcing 2016-08-12 11:25:59 +10:00
Dylan Araps 7480d5c30d Source default config before we source User config 2016-08-12 11:20:32 +10:00
Dylan Araps 216c18cd03 Stop progress bars from being overidden 2016-08-12 10:48:10 +10:00
Dylan Araps a9829cf1e5 Fix missing progress bars travis 2016-08-12 10:41:52 +10:00
Dylan Araps 800870f21b More travis fixes 2016-08-12 10:33:21 +10:00
Dylan Araps 602629b7dd Travis use verbose mode 2016-08-12 10:06:53 +10:00
Dylan Araps 2c9c741329 -v: Show where we sourced the default config from 2016-08-12 09:55:35 +10:00
Dylan Araps b22f6fc44c Source the default config file 2016-08-12 09:47:09 +10:00
Dylan Araps 2c6d048b1c Swap ascii colors around 2016-08-12 09:26:59 +10:00
Muhammad Herdiansyah 52b3f02ea3 Updates on ASCII logos and colors
Included:
* Added Oracle logo (and color)
* Small color tweak on OpenIndiana's logo (and colors)
2016-08-12 00:25:22 +07:00
Dylan Araps 517eef2db6 PacBSD: Add color and fix padding issue 2016-08-11 22:11:16 +10:00
Dylan Araps d9fbadb009 Merge pull request #304 from vendion/master
Adding PacBSD support to neofetch
2016-08-11 22:04:01 +10:00
Adam Jimerson f310d757d4 Switch from if -> case for BSD package counts
Signed-off-by: Adam Jimerson <vendion@gmail.com>
2016-08-11 06:48:34 -04:00
Dylan Araps fd2ab61e2e Merge pull request #303 from konimex/solaris
Added Solaris support
2016-08-07 21:51:42 +10:00
Muhammad Herdiansyah 2e64ff37cd Added Solaris support 2016-08-07 18:42:56 +07:00
Adam Jimerson 01ce345c33 Adding PacBSD support to neofetch
Signed-off-by: Adam Jimerson <vendion@gmail.com>
2016-08-05 16:01:48 -04:00
Dylan Araps 6d3bf930c9 Simplify Tavis ascii 2016-08-05 10:37:13 +10:00
Dylan Araps bb995a21c2 Only 1 newline below cols 2016-08-04 10:25:49 +10:00
Dylan Araps edf6ba0e60 Merge pull request #299 from dylanaraps/prompt
Fix prompt location issues in image mode
2016-08-04 09:30:34 +10:00
Dylan Araps c34759b2da Merge pull request #298 from dylanaraps/ascii
Custom ascii art: Use same format as distro ascii
2016-08-04 09:30:22 +10:00
Dylan Araps 2b41dafe66 Fix issues with prompt location calculation in image mode 2016-08-04 09:20:42 +10:00
Dylan Araps 62e52dd2f6 Eval colors in custom ascii files 2016-08-04 08:34:52 +10:00
Dylan Araps 68f6524a57 Keep old format behaviour 2016-08-02 23:50:05 +10:00
Dylan Araps 59147b9974 Enfore max line length in 'prin' 2016-08-02 23:44:10 +10:00
Dylan Araps 91b9fae44d Remove checks for $line_wrap 2016-08-02 23:21:49 +10:00
Dylan Araps a39592cdc5 Line wrap changes 2016-08-02 23:11:00 +10:00
Dylan Araps d21285c75b CPU Cores (iOS): Fixed backslashes in output 2016-07-29 21:35:32 +10:00
Dylan Araps 3c29c41b55 Add support for GalliumOS 2016-06-27 10:19:52 +10:00
Dylan Araps 1e486850d8 Shorten refresh rate output 2016-06-25 10:56:23 +10:00
Dylan Araps 08223e8a5d Merge branch 'xrandr' of https://github.com/dylanaraps/neofetch 2016-06-25 10:53:59 +10:00
Dylan Araps 95706b101d Fix awk typo 2016-06-24 11:48:18 +10:00
Dylan Araps c8439c4bf9 Fix xrandr output on systems not using gawk 2016-06-24 11:44:22 +10:00
Vincent Aranega e2b14b26ad Fix potential errors from a missing escaped char in regex 2016-06-16 16:11:00 +02:00
Vincent Aranega f5a9393d4b Enhanced font detection for terminology
As 'grep -B' is a GNU extension, a more portable solution is preferable. The most direct and simple solution would be using 'awk':

    awk '/^font.name$/{print a}{a=$0}'

But a sed solution could also be applied:

    sed -n '/^font\.name$/{g;1!p;};h'
2016-06-16 15:39:30 +02:00
Vincent Aranega 90c46651d6 Add terminal font detection support for terminology
Support for terminology font name detection is based on the terminology config file. This file is always located here: `~/.config/terminology/config/standard/base.cfg` (30cb65625b/src/bin/config.c (L216)) and is in a data/binary format. The only way I found (beside coding a dedicated extractor) is to use `strings`. The font name seems to be placed right before the `font.name` string.

    strings ~/.config/terminology/config/standard/base.cfg | grep -B1 font.name | head -1

Here are results that could be output:

    $ strings ~/.config/terminology/config/standard/base.cfg | grep -B1 font.name | head -1
    6x13.pcf
    --> (for a bitmap font) and with another font selected
    $ strings ~/.config/terminology/config/standard/base.cfg | grep -B1 font.name | head -1
    Inconsolata:style=Regular

These results are easily "parseable" in order to extract the font name for display.
2016-06-16 12:14:05 +02:00
Dylan Araps 65c2854caf Make --image off behave like other modes 2016-06-16 17:19:00 +10:00
Dylan Araps c13c17888e Fix #289 2016-06-16 17:09:24 +10:00
Dylan Araps 5f2f1aaeae Merge pull request #287 from iandrewt/refresh_osx-2
improved refresh_rate fix, now actually works on OS X...
2016-06-15 21:24:51 +10:00
Andrew Titmuss df1e73a6b0
better way that works in multi monitor setups 2016-06-15 21:02:33 +10:00
Andrew Titmuss cd51987f17
improved refresh_rate fix, now actually works on OS X... 2016-06-15 20:18:57 +10:00
Dylan Araps 9e49e31bba Merge branch 'master' of https://github.com/dylanaraps/neofetch 2016-06-14 17:10:14 +10:00
Andrew Titmuss f61dde03b0
missed the other brackets... 2016-06-14 17:07:35 +10:00
Andrew Titmuss 47a850a305
changed double bracket 2016-06-14 17:04:22 +10:00
Dylan Araps 517bde1ce3 Merge branch 'master' of https://github.com/dylanaraps/neofetch 2016-06-14 17:02:29 +10:00
Dylan Araps 50ff116b64 Remove regex matching from disk usage 2016-06-14 17:02:14 +10:00
Andrew Titmuss 1d6f99b0d4
better test for 0Hz 2016-06-14 17:01:04 +10:00
Andrew Titmuss 3d52a73e3a
fixed refresh rate on OS X 2016-06-14 11:46:41 +10:00
Andrew Titmuss 9eea0ac869 Add support for macOS Sierra 2016-06-14 08:08:09 +10:00
Dylan Araps 5e0c15a352 Merge pull request #281 from dylanaraps/usage
Fix CPU Usage
2016-06-13 22:37:47 +10:00
Dylan Araps 9f28c025bb Condense awk command 2016-06-13 22:33:34 +10:00
Dylan Araps 758f883eb9 Update comments 2016-06-13 22:22:59 +10:00
Dylan Araps e54ebf8367 Fix incorrect info color when barinfo is used. Closes #282 2016-06-13 21:59:54 +10:00
Dylan Araps 57a0ed4d5d Update usage 2016-06-13 21:42:53 +10:00
Dylan Araps 1be5423b1d Fix usage on BSD 2016-06-13 21:21:32 +10:00
Dylan Araps d3c2216f48 Add CPU Usage comments 2016-06-13 20:46:13 +10:00
Dylan Araps 82143f4712 Fuck wmic 2016-06-13 20:42:16 +10:00
Dylan Araps 4a3de0c8ae Fixed whitespace for realsies this time 2016-06-13 20:40:31 +10:00
Dylan Araps dd82e6de24 Fix whitespace take 2 2016-06-13 20:32:20 +10:00
Dylan Araps ac9c0a80c7 Fix whitespace on Windows 2016-06-13 20:28:31 +10:00
Dylan Araps 8e8ac505ca Fix spacing on windows 2016-06-13 20:26:21 +10:00
Dylan Araps c3ddcaa331 --test: Include cpu usage 2016-06-13 20:23:57 +10:00
Dylan Araps c69a8f2418 Move CPU Usage to its own function 2016-06-13 20:22:38 +10:00
Dylan Araps 24fde4f6a6 Fix prompt issues 2016-06-13 19:50:20 +10:00
Dylan Araps d65aa4bc6b Fix cpu usage 2016-06-13 19:40:54 +10:00
Dylan Araps efcc7e8273 Fix image mode in tmux 2016-06-13 19:25:09 +10:00
Dylan Araps c5beb9f0dc Remove comment at the top of the script about dependencies 2016-06-13 19:18:47 +10:00
Dylan Araps ec8e4f5d5b Remove image_position 2016-06-13 19:08:03 +10:00
Dylan Araps 43d4e1e865 Add comment 2016-06-13 17:29:25 +10:00
Dylan Araps 64ed65fbf0 Uncomment functions 2016-06-13 17:28:01 +10:00
Dylan Araps 6f8dc8ad64 Remove prompr_height 2016-06-13 17:25:10 +10:00
Dylan Araps c6c0b78d04 Unset extglob 2016-06-13 16:14:03 +10:00
Dylan Araps 79fccfa930 Remove bc usage from OpenBSD battery 2016-06-12 17:23:11 +10:00
Dylan Araps 15c6720c26 OS X memory: Remove the need for 'bc' 2016-06-12 17:13:26 +10:00
Dylan Araps 8b02c2de37 Disk usage: Remove need for 'bc', fix syntax errors 2016-06-12 17:06:31 +10:00
Dylan Araps 6dcb4e2c38 Fix merge conflicts 2016-06-12 16:40:42 +10:00
Dylan Araps 9d84ede7dc Fix merge conflicts 2016-06-12 16:26:34 +10:00
Dylan Araps ff7ab26d6d Remove all '! -z' 2016-06-12 16:18:49 +10:00
Dylan Araps b9e318decd It turns out that you can't quote these 2016-06-12 16:12:21 +10:00
Dylan Araps 899d3bc55e Fix error with string 2016-06-12 16:02:28 +10:00
Dylan Araps d707df39dc Quote all the things 2016-06-12 15:51:48 +10:00
Dylan Araps 67a0879a3a Fix lint errors 2016-06-12 14:35:29 +10:00
Dylan Araps 00b45307bc Supress xprop errors if xprop isn't installed 2016-06-12 13:18:16 +10:00
Dylan Araps ba78e2c888 Quote trim command 2016-06-12 12:10:10 +10:00
Dylan Araps 5d4e65ad54 Trim '$ascii_distro' variable 2016-06-12 12:06:30 +10:00
Dylan Araps 34c89c05cc Fix windows ascii logo 2016-06-12 11:59:21 +10:00
Dylan Araps 64182e6ef7 Whitespace trim, handle multiline strings 2016-06-12 11:57:10 +10:00
Dylan Araps dac32f3ab1 Remove another pointless substitution 2016-06-12 11:45:33 +10:00
Dylan Araps 8b0d6a2095 GTK Theme: Group subsitutions 2016-06-12 11:41:25 +10:00
Dylan Araps 52a8cd4916 Readd a substitution that shouldn't have been removed 2016-06-12 11:11:34 +10:00
Dylan Araps f855ae2432 Move all whitespace trimming to an external function 2016-06-12 11:06:35 +10:00
Dylan Araps f18c315697 Fix whitespace in Windows OS line 2016-06-12 10:18:35 +10:00
Vincent Aranega 8334fba313 Fix for terminology: does not fallback on ascii when no wallpaper is found
When no image is set and there is no background image (or a `.xml` is detected) and the image option is set to `wall` (default), neofetch does not fallback on ascii mode.
The issue comes from the line 2310:

    if [ ! -f "$img" ] || [ ${#term_size} -le 5 ] && [ "$image_backend" != "tycat" ]; then

as `||` and `&&` have the same priority, bash does not evaluate `[ ${#term_size} -le 5 ] && [ "$image_backend" != "tycat" ]` first.

Solution is simply this

    if [ ! -f "$img" ] || ([ ${#term_size} -le 5 ] && [ "$image_backend" != "tycat" ]); then
2016-06-10 16:47:06 +02:00
Dylan Araps 470afe9509 Image shuffle: path no longer requires a '/' - @aranega 2016-06-10 23:10:54 +10:00
Dylan Araps 6723d54078 Merge pull request #273 from dylanaraps/terminology
Add terminology image support 2
2016-06-10 19:47:01 +10:00
Dylan Araps 067c200b71 Simplified image shuffle, thanks @aranega 2016-06-10 19:46:00 +10:00
Dylan Araps e747943c08 Remove stray newlines 2016-06-10 18:34:47 +10:00
Dylan Araps 442c5d936b Reduce size of term_size format block 2016-06-10 18:31:19 +10:00
Dylan Araps f09890ff33 Reduce read count to 1 2016-06-10 18:11:47 +10:00
Dylan Araps 0825e282cd Add terminology support 2016-06-10 17:58:24 +10:00
Dylan Araps 0527469643 Remove stray newline 2016-06-09 16:10:05 +10:00
Dylan Araps d5c32a1805 Fix color blocks bug 2016-06-09 16:09:20 +10:00
Dylan Araps 80a73320ae Merge pull request #271 from iandrewt/cmus-fix
fixed cmus properly, now works regardless of output order
2016-06-05 09:19:51 +10:00
Andrew Titmuss e2e74f1de3
cmus now works with only 1 call for entire block 2016-06-05 09:07:47 +10:00
Andrew Titmuss 8d88fe172e
fixed cmus properly, now works regardless of output order 2016-06-05 08:03:50 +10:00
Dylan Araps e2e0811116 Merge pull request #252 from dylanaraps/term_font
Terminal and Terminal Font detection.
2016-06-03 18:27:21 +10:00
Dylan Araps c5b88c68a9
If the parent process is python, exit the function 2016-06-03 18:08:19 +10:00
Dylan Araps c1450f8288
Fix trailing '-' with gnome-terminal 2016-06-02 21:14:19 +10:00
Dylan Araps 4a431b40f8
Remove '' variable since it was pointless 2016-06-02 21:11:33 +10:00
Dylan Araps 0e4c74e913 Merge pull request #269 from iandrewt/gpmdp-remote-migration
migrate from gpmdp to gpmdp-remote
2016-06-01 21:06:52 +10:00
Andrew Titmuss 84a3425be4
migrate from gpmdp to gpmdp-remote 2016-06-01 21:04:22 +10:00
Dylan Araps db1e466b78 Changed color order so that the title is now much more colorful 2016-06-01 17:43:44 +10:00
Dylan Araps df5164efae Add support for Devuan 2016-06-01 17:19:40 +10:00
Dylan Araps 0a803041b2 '--ascii_distro mac' now works correctly 2016-05-31 13:28:49 +10:00
Dylan Araps af8646fe66 Merge pull request #266 from dylanaraps/size_none
Add '--size none' to disable cropping / resizing the images.
2016-05-31 12:12:44 +10:00
Dylan Araps c3164b7cfe Remove comments 2016-05-31 12:09:21 +10:00
Dylan Araps 3636abd2ac Disable OS X font width changes 2016-05-31 12:01:26 +10:00
Dylan Araps 4716bb7d0d Add --version and update docs 2016-05-30 15:14:16 +10:00
Dylan Araps cf95f70f85 Fix issues with color blocks adding random newlines to the terminal 2016-05-29 10:03:18 +10:00
Dylan Araps 51aa7d01cd Fix wrong value for block width 2016-05-28 19:51:21 +10:00
Andrew Titmuss 543da69eb1
fixed iTunes song output 2016-05-28 15:24:40 +10:00
Dylan Araps 70aa01aebb Move comparison to inside if statement 2016-05-28 14:07:19 +10:00
Dylan Araps 77fe15cb29 Move comment to right place 2016-05-28 14:04:52 +10:00
Dylan Araps 7023a37658 Fixed wrong order 2016-05-28 14:02:32 +10:00
Dylan Araps a98d96eb8c Halve font width on iTerm2 2016-05-28 14:01:44 +10:00
Dylan Araps 37e7d8e4b3 Condense term function 2016-05-28 11:38:41 +10:00
Dylan Araps a7f7218b24 More Travis fixes 2016-05-28 11:35:20 +10:00
Dylan Araps a846076807 Fix some travis issues 2016-05-28 11:31:15 +10:00
Dylan Araps 64d2680278 Add term and termfont to --test 2016-05-28 11:28:41 +10:00
Dylan Araps 79f8d55a56 Shorten terminal title 2016-05-28 11:22:34 +10:00
Dylan Araps f2eb877bae Remove all whitespace from terminal name 2016-05-28 11:19:24 +10:00
Dylan Araps 5a99cb5237 term: Add support for tty 2016-05-28 11:16:13 +10:00
Dylan Araps fd30321120 Update ascii changes 2016-05-28 11:05:29 +10:00
Dylan Araps ec1705835c Revert last two commits 2016-05-28 10:27:58 +10:00
Dylan Araps 8d33b4051f Fix incorrect OS value 2016-05-28 10:24:35 +10:00
Dylan Araps aed6e9a40f Merge branch 'term_font' of github.com:dylanaraps/neofetch into term_font 2016-05-28 10:15:24 +10:00
Dylan Araps 91b66052f1 Remove needless split between blocks 2016-05-28 10:14:45 +10:00
Dylan Araps 7f2f83039b Add '--block_height' / '$block_height' to change the height of the color blocks 2016-05-28 09:53:35 +10:00
Dylan Araps ac2fcf7d77 Fix double space in theme output 2016-05-27 15:25:45 +10:00
Dylan Araps bd070d5059 Update docs 2016-05-27 15:23:02 +10:00
Dylan Araps 37519f42b1 Fix issue with auto sized images 2016-05-27 15:13:37 +10:00
Dylan Araps 348117efb8 Add '--size none' to use the image's original size 2016-05-27 14:56:09 +10:00
Andrew Titmuss aae23dc6d1
fixed songo output for cmus
Previously would print `"song name" "song artist" -`
2016-05-23 16:28:50 +10:00
Andrew Titmuss 184149c302
added apple terminal font support 2016-05-23 12:35:47 +10:00