Andrew Titmuss
cd51987f17
improved refresh_rate fix, now actually works on OS X...
2016-06-15 20:18:57 +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
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
