Commit Graph

1774 Commits

Author SHA1 Message Date
Dylan Araps 8b02c2de37 Disk usage: Remove need for 'bc', fix syntax errors 2016-06-12 17:06:31 +10:00
Dylan Araps 4f65a81fd1 Changelog 2016-06-12 16:44:19 +10:00
Dylan Araps d3c87cdaac Merge branch 'whitespace_fix' 2016-06-12 16:40:58 +10:00
Dylan Araps 6dcb4e2c38 Fix merge conflicts 2016-06-12 16:40:42 +10:00
Dylan Araps 23f429dc84 Changelog 2016-06-12 16:34:37 +10:00
Dylan Araps 372c09acc1 Merge pull request #278 from dylanaraps/quote
Quote all the things
2016-06-12 16:32:54 +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 3b00bf8375 Changelog 2016-06-12 14:37:02 +10:00
Dylan Araps 67a0879a3a Fix lint errors 2016-06-12 14:35:29 +10:00
Dylan Araps bd6225aa66 Changelog 2016-06-12 13:18:47 +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
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