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
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
00bf34b88f
Changelog
2016-06-13 19:16:00 +10:00
Dylan Araps
45445e2c5e
Changelog
2016-06-13 19:14:56 +10:00
Dylan Araps
1be7454d08
Merge pull request #280 from dylanaraps/image_position
...
Remove Image position
2016-06-13 19:12:29 +10:00
Dylan Araps
0b0021ed31
Merge pull request #279 from dylanaraps/prompt
...
Dynamically set cursor position in image mode.
2016-06-13 19:10:50 +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
d74ee36d8c
Update man page
2016-06-12 18:38:16 +10:00
Dylan Araps
3cbca32c1d
Changelog
2016-06-12 17:25:57 +10:00
Dylan Araps
a290b533bc
Changelog
2016-06-12 17:23:54 +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
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
