Commit graph

1801 commits

Author SHA1 Message Date
Dylan Araps
f18c315697 Fix whitespace in Windows OS line 2016-06-12 10:18:35 +10:00
Dylan Araps
d5fbd1f1ee Merge pull request #276 from aranega/master
Fix for terminology support: does not fallback on ascii when no wallpaper is found
2016-06-11 01:25:52 +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
913321752d Changelog 2016-06-10 23:12:50 +10:00
Dylan Araps
1a546d771b Merge branch 'master' of https://github.com/dylanaraps/neofetch 2016-06-10 23:11:10 +10:00
Dylan Araps
470afe9509 Image shuffle: path no longer requires a '/' - @aranega 2016-06-10 23:10:54 +10:00
Dylan Araps
1a354f701f Merge pull request #274 from iandrewt/master
fixed readme, should have been terminology not terminator
2016-06-10 23:07:45 +10:00
Andrew Titmuss
e45816fff3
fixed readme, should have been terminology not terminator 2016-06-10 22:21:07 +10:00
Dylan Araps
b854e4a148 Readme 2016-06-10 19:55:26 +10:00
Dylan Araps
3271453186 Changelog 2016-06-10 19:52:23 +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
a86907bd5a
Changelog 2016-06-05 09:21:43 +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
c61d784e20
Better image 2016-06-03 18:40:39 +10:00
Dylan Araps
73ab375067
Changelog 2016-06-03 18:38:56 +10:00
Dylan Araps
fe4ba09715
Sigh 2016-06-03 18:37:55 +10:00
Dylan Araps
56447fc35c
Changelog 2016-06-03 18:37:33 +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
bdc445cc6f
Update Readme 2016-06-01 21:07:38 +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
04a248e6de
Update thanks 2016-06-01 19:17:22 +10:00
Dylan Araps
2c69cf7370 Changelog 2016-06-01 17:44:36 +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
45014ea349 Changelog 2016-06-01 17:20:21 +10:00
Dylan Araps
df5164efae Add support for Devuan 2016-06-01 17:19:40 +10:00
Dylan Araps
217560fcca Changelog 2016-05-31 13:29:19 +10:00
Dylan Araps
0a803041b2 '--ascii_distro mac' now works correctly 2016-05-31 13:28:49 +10:00
Dylan Araps
23d7253057 Changelog 2016-05-31 12:14:05 +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
b05226b817 Even better scrot 2016-05-29 18:00:31 +10:00
Dylan Araps
0546ee11c4 Better Screenshot 2016-05-29 17:58:51 +10:00
Dylan Araps
430abc567f Fix broken screenshot link? 2016-05-29 13:49:23 +10:00
Dylan Araps
2ef37fcd93 New screenshot' 2016-05-29 13:46:06 +10:00
Dylan Araps
cf95f70f85 Fix issues with color blocks adding random newlines to the terminal 2016-05-29 10:03:18 +10:00