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