Commit graph

1495 commits

Author SHA1 Message Date
Michael Straube
f74450a5de Song: Add support for JuK and Bluemindo 2016-12-23 14:34:33 +01:00
Dylan Araps
15186b3d70 Ascii: Update MX logo 2016-12-24 00:23:19 +11:00
Dylan Araps
bbdcfc6312 Cols: Remove $start + $end in favor of ${block_range[@]} 2016-12-24 00:09:16 +11:00
Dylan Araps
9b448dac6a Date: Simplify math 2016-12-23 23:49:53 +11:00
Dylan Araps
eebef409fd Dynamic Prompt: Simplify math 2016-12-23 23:46:51 +11:00
Dylan Araps
214f7b2e27 General: Add { } around all XDG_CONFIG_HOME instances 2016-12-23 23:38:39 +11:00
Dylan Araps
835b13c2b6 General: Add { } to all $HOME instances 2016-12-23 23:35:32 +11:00
Dylan Araps
2c5d13846a OS: Proper error handling 2016-12-23 23:28:59 +11:00
Dylan Araps
220bd852ba Kernel: Add back OS check but simplify it 2016-12-23 21:08:26 +11:00
Dylan Araps
3c2fc99271 Kernel: Simplify check 2016-12-23 21:05:23 +11:00
Muhammad Herdiansyah
9180914dcf DE: Fixed GNOME fallback detection 2016-12-23 12:09:28 +07:00
Dylan Araps
512c3beffd Docs: Add better docs 2016-12-23 11:41:11 +11:00
Michael Straube
7d284e4bbb Add support for Exaile 2016-12-22 23:47:07 +01:00
Dylan Araps
faf577ccc0 Merge pull request #555 from dylanaraps/wm-fix
DE: Fix cases where WM == DE
2016-12-23 01:10:34 +11:00
Dylan Araps
ab87fb15e2 OS: Added support for SalentOS 2016-12-23 01:08:14 +11:00
Dylan Araps
d396e52924 DE: Exit function if DE == WM 2016-12-23 00:39:39 +11:00
Dylan Araps
4d8bebec4b Info: Log if function was used before 2016-12-23 00:38:21 +11:00
Dylan Araps
9b7e84a553 DE: Fix match 2016-12-23 00:32:22 +11:00
Dylan Araps
5e3a3997e2 DE: Fix case issue 2016-12-23 00:29:09 +11:00
Dylan Araps
d632380728 DE: Fix duplicate DE/WM 2016-12-23 00:25:23 +11:00
Dylan Araps
48b3b575d3 Shell: Fix space in path 2016-12-23 00:14:19 +11:00
Dylan Araps
7653e3bef7 Images: Fix term size on Terminology 2016-12-22 20:43:58 +11:00
Dylan Araps
4ca4e88697 Images: Fix bugs 2016-12-22 20:39:43 +11:00
Dylan Araps
8318a9c30c KDE: Add support for KDE3 2016-12-22 19:07:34 +11:00
Dylan Araps
65193012b9 KDE: Remove kde5-config support 2016-12-22 19:04:28 +11:00
Dylan Araps
9f76818850 Theme: Fixed KDE theme not working 2016-12-22 18:57:01 +11:00
Dylan Araps
cf7cc40437 General: Fix incoreect logging of cols and line breaks 2016-12-22 18:22:57 +11:00
Dylan Araps
25400f7f00 General: Save the old $IFS value 2016-12-22 18:20:57 +11:00
Dylan Araps
0726fab26b Ascii: Added ascii art for TrueOS and PCBSD 2016-12-22 14:44:20 +11:00
Dylan Araps
cb69e8c3b2 OS: [TrueOS] Use FreeBSD ascii art 2016-12-22 14:38:16 +11:00
Dylan Araps
4376391112 OS: Add detection for TrueOS 2016-12-22 14:36:13 +11:00
Dylan Araps
c23194a5e8 Docs: Note that --gpu_type only works on Linux 2016-12-22 13:38:41 +11:00
Dylan Araps
f5d2aac5aa GPU: Add --gpu_type 2016-12-22 13:23:48 +11:00
Dylan Araps
ab4edd42cf GPU: Count from 1, Add $gpu_show to change which GPUs are displayed 2016-12-22 13:19:25 +11:00
Dylan Araps
37d3b9f9a4 GPU: Use $subtitle with prin 2016-12-22 13:04:43 +11:00
Dylan Araps
29aa4e11d3 Merge branch 'master' into multi-gpu 2016-12-22 13:03:53 +11:00
Dylan Araps
16faf0ebee Battery: Fix blank subtitle 2016-12-22 13:03:15 +11:00
Dylan Araps
d74a7ce4e9 GPU: Use arithmetic test 2016-12-22 13:01:04 +11:00
Dylan Araps
988c0b29a7 GPU: Rename index to gpu_num 2016-12-22 13:00:16 +11:00
Dylan Araps
7069410ef2 GPU: Only number GPU if more than one exists 2016-12-22 12:47:11 +11:00
Dylan Araps
32116ea67f GPU: Don't remove all matches 2016-12-22 11:26:52 +11:00
Dylan Araps
57d14905bc GPU: Print each GPU on a different line 2016-12-22 11:17:02 +11:00
Dylan Araps
faf1c7d813 Verbose: Send error messages to stderr 2016-12-20 22:36:54 +11:00
Dylan Araps
136ea2ec6e General: Minor change 2016-12-20 22:35:17 +11:00
Dylan Araps
56b13c9ef5 Docs: Fix grammar errors in comments 2016-12-20 21:17:40 +11:00
Dylan Araps
5fbab59748 Merge pull request #552 from dylanaraps/minixfix
General: [Minix] Fix unsupported escape sequences in Minix.
2016-12-20 19:49:02 +11:00
Dylan Araps
a101014e02 OS: Fix blank ascii art on AntiX 2016-12-20 15:00:16 +11:00
Dylan Araps
69123890f5 Distro: Fix missing ascii art on MX 2016-12-20 14:50:06 +11:00
Dylan Araps
2bda560e0a Fix merge conflicts 2016-12-20 12:17:08 +11:00
Dylan Araps
b9e8d80ab3 Distro: Added support for MX and AntiX 2016-12-20 12:15:34 +11:00
Dylan Araps
01a71c73fd General: [Minix] Fix unsupported escape sequences in Minix. 2016-12-19 20:16:37 +11:00
Herdiansyah
94064af2a5 Merge pull request #547 from konimex/minix
OS: Added initial support for MINIX
2016-12-19 14:29:38 +07:00
Dylan Araps
fc8e8ce605 Merge branch 'master' into logosize 2016-12-19 16:09:29 +11:00
Dylan Araps
c37f197ade General: Add warning about ascii_logo_size 2016-12-19 16:06:59 +11:00
Dylan Araps
d7e3ccb881 Cols: Correctly calculate height 2016-12-19 15:58:47 +11:00
Dylan Araps
3205ec0fbc Image: Disable image mode if $DISPLAY is unset, closes #543 2016-12-19 15:56:30 +11:00
Dylan Araps
17f3a7acde Cols: Fix spacing issue 2016-12-19 15:29:39 +11:00
Dylan Araps
7276ad3a65 Cols: Bypass info/prin 2016-12-19 15:25:48 +11:00
Dylan Araps
70a684597a General: Fix bug with line break 2016-12-19 15:23:20 +11:00
Dylan Araps
2b94fbfadb General: Fix artifacts and broken block width in TTYs 2016-12-19 15:13:45 +11:00
Dylan Araps
c205fc8987 Args: Fix user config being sourced twice 2016-12-19 15:02:02 +11:00
Dylan Araps
3865d0626e Docs: Fix spelling errors 2016-12-19 14:53:38 +11:00
Dylan Araps
fbf59a7785 Ascii: Remove ascii_logo_size 2016-12-19 14:43:07 +11:00
Muhammad Herdiansyah
6e7dfef790 Local IP [Minix]: Deleted case in Linux/BSD/Solaris' local_ip 2016-12-19 10:42:50 +07:00
Muhammad Herdiansyah
61f21f8762 Merge remote-tracking branch 'upstream/minix2' into minix (#549) 2016-12-19 10:38:12 +07:00
Dylan Araps
b3932af501 Disk: Fix flags on Minix 2 2016-12-19 12:08:35 +11:00
Dylan Araps
2942abd46b Disk: Fix disk on Minix 2016-12-19 12:07:20 +11:00
Dylan Araps
d396c14f2a Local IP: Fix IP address on Minix 2016-12-19 11:58:49 +11:00
Dylan Araps
446926ddb4 Shell: Fix bug with sh and --version 2016-12-19 11:56:16 +11:00
Dylan Araps
6339b2f27a OS: Add inital support for Minix (Konimex) 2016-12-19 11:54:52 +11:00
Dylan Araps
ffc1991628 Ascii: Added ascii for Minix 2016-12-19 11:38:06 +11:00
Alexander 'z33ky' Hirsch
282c8ceb5a Song: Add support for xmms2 2016-12-18 17:39:53 +01:00
Muhammad Herdiansyah
c3d60901d9 OS: Added initial support for MINIX 2016-12-18 21:55:46 +07:00
Dylan Araps
23305f0486 General: Reorder PATH 2016-12-19 00:40:55 +11:00
Dylan Araps
de15bf52c0 General: Revert PATH changes and add /usr/sbin and /sbin to PATH 2016-12-18 23:49:31 +11:00
Dylan Araps
976ae0090f Battery: Fix % sign when no battery detected on Windows 2016-12-18 23:23:58 +11:00
Dylan Araps
63529ddebf Resolution: blank resolution on Windows 2016-12-18 23:05:37 +11:00
Dylan Araps
180d5b32c5 Image: Better xrdb command 2016-12-18 20:05:31 +11:00
Muhammad Herdiansyah
9496c542eb CPU: Remove more unneeded outputs 2016-12-18 12:08:27 +07:00
Muhammad Herdiansyah
9dfb8068f9 Merge branch 'gnu-to-linux' 2016-12-18 09:16:19 +07:00
Muhammad Herdiansyah
48ee97fcd1 GPU: Remove more filler stuff from AMD
Source: http://redd.it/5iqjf1
2016-12-17 17:45:06 +07:00
Muhammad Herdiansyah
1ba4bc3da8 General: Set fixed PATH 2016-12-17 17:11:56 +07:00
Muhammad Herdiansyah
e8b121c938 Local IP: Merge BSD and Solaris to Linux 2016-12-17 17:11:56 +07:00
Muhammad Herdiansyah
93e7ab0b3a OS: Merge all "GNU" instances to Linux 2016-12-17 17:11:55 +07:00
Dylan Araps
7130124c49 Model: Remove more OEM strings 2016-12-17 11:37:00 +11:00
Dylan Araps
a95450a1bf Distro: Silence source 2016-12-17 11:35:35 +11:00
Dylan Araps
b33bb25f7f Merge pull request #542 from dylanaraps/disk
Disk: Rewrite get_disk()
2016-12-17 10:44:59 +11:00
Dylan Araps
7b99e15e1f Disk: Don't declare variables if we're only using them once 2016-12-17 10:22:11 +11:00
Dylan Araps
952834f8be Disk: Use usage percentage to calculate bar 2016-12-17 10:11:51 +11:00
Dylan Araps
b2e8c33c3d Disk: Fix progress bars 2016-12-17 00:25:58 +11:00
Dylan Araps
5d9901b34e Disk: Ommit 'i' 2016-12-17 00:12:51 +11:00
Dylan Araps
91143de1a5 Disk: Use -P for all OS 2016-12-17 00:06:12 +11:00
Dylan Araps
868d8c2d8e Disk: [macOS] Use -P 2016-12-17 00:03:58 +11:00
Dylan Araps
265e14b151 Disk: Remove test 2016-12-16 23:56:33 +11:00
Dylan Araps
43eaf34242 Disk: Test df output on travis 2016-12-16 23:52:10 +11:00
Dylan Araps
157911547a Disk: Split the output differently for macOS 2016-12-16 23:47:08 +11:00
Dylan Araps
d738ad6f82 Disk: If df fails, abort 2016-12-16 23:14:20 +11:00
Dylan Araps
49a9694827 Disk: Use '-h' 2016-12-16 23:07:15 +11:00
Dylan Araps
17e9fa7774 Disk: Print filesystem type 2016-12-16 22:54:16 +11:00
Dylan Araps
4cf108015c Disk: Remove empty var handling 2016-12-16 22:40:31 +11:00
Dylan Araps
5abba17564 Disk: Rewrite get_disk. 2016-12-16 22:32:46 +11:00
Muhammad Herdiansyah
3fc42f3245 ASCII: Fixed ASCII not appearing for Oracle Solaris and Oracle Linux 2016-12-16 17:37:35 +07:00
Dylan Araps
2878b2a85c Merge pull request #538 from dylanaraps/birthday
Birthday: Remove 'date' usage and calclulate date manually
2016-12-16 19:54:35 +11:00
Dylan Araps
2490a45293 Birthday: Rename get_birthday() to get_install_date() 2016-12-16 18:03:29 +11:00
Dylan Araps
d375aa24d6 Birthday: Fix bug with 0:00 2016-12-16 17:38:54 +11:00
Dylan Araps
665e9ceb68 Birthday: Add back --birthday_time 2016-12-16 15:59:07 +11:00
Dylan Araps
e23f6cdc0c Merge branch 'master' of github.com:dylanaraps/neofetch 2016-12-16 14:57:51 +11:00
Dylan Araps
d2a31d2cf5 Disk: Remove Solaris (broken) 2016-12-16 14:57:34 +11:00
Dylan Araps
31930d0211 Birthday: Fix 12:00 2016-12-16 14:53:47 +11:00
Dylan Araps
1643b4fbd2 Birthday: Properly handle 00 2016-12-16 14:52:56 +11:00
Dylan Araps
828ad2692f Birthday: Handle 00:00 2016-12-16 14:51:30 +11:00
Dylan Araps
1fa98d7bf1 Birthday: Add sources 2016-12-16 14:44:04 +11:00
Dylan Araps
80f07c9619 Merge pull request #540 from dylanaraps/rm_subshell
General: Remove printf subshells
2016-12-16 13:35:04 +11:00
Dylan Araps
bfdca24bbd Birthday: Fix macOS birthday command 2016-12-16 13:33:50 +11:00
Dylan Araps
332782a444 Merge pull request #537 from dylanaraps/args
Args: Fix config bug and remove large case for single regex match
2016-12-16 13:25:24 +11:00
Dylan Araps
6da7ab06f1 General: Remove printf subshells 2016-12-16 13:20:10 +11:00
Dylan Araps
89f7c2210d Uptime: Revert date removal 2016-12-16 13:12:18 +11:00
Dylan Araps
3bbe52b93b Args: Fix regex 2016-12-16 12:50:39 +11:00
Dylan Araps
bce34c8e40 Shell: Fix ksh on BSD, closes #539 2016-12-16 12:49:59 +11:00
Dylan Araps
27e634fc0c Birthday: Fix Month matching on Windows 2016-12-16 12:33:42 +11:00
Dylan Araps
62a87b7bf6 Birthday: [BSD] Fix openBSD 2016-12-16 12:28:11 +11:00
Dylan Araps
ff0d9e9e73 Birthday: Fix BSD field order 2016-12-16 12:22:18 +11:00
Dylan Araps
bb7f4ac26b Birthday: Swap BSD / macOS fields 2016-12-16 12:10:05 +11:00
Dylan Araps
382392240c Birthday: Remove old macOS block 2016-12-16 12:07:44 +11:00
Dylan Araps
14610a992c Birthday: Merge macOS with BSD 2016-12-16 12:07:01 +11:00
Dylan Araps
708beb1716 Birthday: Remove macOS substitutions 2016-12-16 11:27:53 +11:00
Dylan Araps
6698463df6 Birthday: Remove 'date' usage and calclulate date manually 2016-12-16 11:20:10 +11:00
Dylan Araps
70e74768b5 Args: Fix config bug and remove large case for single regex match 2016-12-16 10:03:44 +11:00
Dylan Araps
ead030199f Local IP: [Windows] Support multiple interfaces 2016-12-16 09:41:52 +11:00
Dylan Araps
bb3fd97a78 Merge pull request #536 from dylanaraps/song_dbus
Song: Cleanup get_song()
2016-12-16 00:11:39 +11:00
Dylan Araps
571a545966 Song: Remove state output 2016-12-16 00:05:41 +11:00
Dylan Araps
8aef69b77f Song: Move dbus commands to a function 2016-12-15 23:40:54 +11:00
Dylan Araps
ca8c45b668 Song: Remove duplicate blocks 2016-12-15 23:29:34 +11:00
Dylan Araps
4f8bf2699d CPU Usage: Add missing core commands and update old ones 2016-12-15 23:19:40 +11:00
Dylan Araps
856cabf757 Uptime: Rewrite part of uptime 2016-12-15 22:55:15 +11:00
Dylan Araps
49ff6045fb Merge pull request #533 from dylanaraps/shell
Shell: Rewrite function
2016-12-15 22:38:49 +11:00
Dylan Araps
844720f85a Shell: Make all other shells use --version 2016-12-15 22:27:13 +11:00
Herdiansyah
0fdd3b8637 CPU [Linux]: Added CPU name detection for more architectures (#529)
This fixes #526.
2016-12-15 18:03:10 +07:00
Dylan Araps
91825d4bc7 Shell: Add support for xonsh 2016-12-15 22:02:32 +11:00
Dylan Araps
cd9b9bb00b Shell: [ksh] Use --version 2016-12-15 21:54:04 +11:00
Dylan Araps
d1cd0fd741 Shell: Cut 'version' from ksh output 2016-12-15 21:44:02 +11:00
Dylan Araps
c6c4a47cf5 Shell: Rewrite function 2016-12-15 21:19:29 +11:00
Dylan Araps
68c9933120 Shell: Fixed memory leak caused by fish. Closes #531 2016-12-15 20:55:07 +11:00
Dylan Araps
254e92d027 Merge pull request #530 from dylanaraps/prin
General: Delete most of info() and instead call prin()
2016-12-15 17:56:36 +11:00
Dylan Araps
6c5b557623 General: Simplify test 2016-12-15 10:28:52 +11:00
Dylan Araps
2541aa7c01 Merge pull request #528 from dylanaraps/help2man
Generate man page from --help and --version
2016-12-15 09:32:29 +11:00
Dylan Araps
588c3e971a General: Added --gen-man 2016-12-14 23:04:08 +11:00
Dylan Araps
6557e4f1c3 General: Remove pointless comment 2016-12-14 22:15:42 +11:00
Dylan Araps
6647c77096 Info: Add checks to see if prin() was used directly 2016-12-14 22:12:42 +11:00
Dylan Araps
139c55f257 General: Remove stray comment 2016-12-14 21:59:56 +11:00
Dylan Araps
1632a61753 Info: Move get_title() and get_underline() formatting to their own functions 2016-12-14 21:57:48 +11:00
Dylan Araps
abd0391c36 Info: Reduce size of prin() further 2016-12-14 21:35:45 +11:00
Dylan Araps
5ff2a7d9dc Info: Further reduce size of info() 2016-12-14 21:33:05 +11:00
Dylan Araps
bdcb0955c4 General: Delete most of info() and instead call prin() 2016-12-14 19:53:03 +11:00
Dylan Araps
2433b79d1e Merge pull request #527 from dylanaraps/cpu_fix
CPU: Function cleanup
2016-12-14 19:23:09 +11:00
Dylan Araps
d35d9a01d7 Version: Swap quotes' 2016-12-14 17:21:17 +11:00
Dylan Araps
67a8be1688 Update help 2016-12-14 17:10:20 +11:00
Dylan Araps
58f514ddd4 Update help 2016-12-14 17:08:55 +11:00
Dylan Araps
bb641a5986 Docs: Add note about Ubuntu-Studio 2016-12-14 17:05:23 +11:00
Muhammad Herdiansyah
9aed2b0103 Memory [Solaris]: Changed function name for consistency 2016-12-14 11:57:12 +07:00
Dylan Araps
2dfa044d4c Generate man page from --help and --version 2016-12-14 12:42:58 +11:00
Dylan Araps
4413c0f210 CPU: Remove duplicate substitutions 2016-12-14 11:57:02 +11:00
Dylan Araps
dc08df12ac CPU: Simplify format check 2016-12-14 11:45:33 +11:00
Dylan Araps
f7686ee8e8 CPU: Update comments 2016-12-14 11:40:29 +11:00
Dylan Araps
5a6a3d7e5b CPU: [NetBSD] Remove case statement in favor of 1 line test 2016-12-14 11:33:19 +11:00
Dylan Araps
fdc350f136 General: Add warnings speed_type options 2016-12-14 11:22:02 +11:00
Dylan Araps
440153e7d8 CPU: Don't simplify option names for no reason 2016-12-14 11:14:59 +11:00
Dylan Araps
bfa1ce6cd9 Info: Remove useless blocks 2016-12-13 19:09:26 +11:00
Dylan Araps
901136e1af Ascii: Fix bug when $image_source = ascii 2016-12-13 15:15:32 +11:00
Dylan Araps
4ce470e6b8 Merge pull request #523 from dylanaraps/de
DE: Better Desktop Environment Detection.
2016-12-13 12:04:48 +11:00
Dylan Araps
101d5c5254 DE: Check {GNOME,MATE}_DESKTOP_SESSION_ID 2016-12-13 11:25:00 +11:00
Dylan Araps
c3596680c9 DE: Better DE detection 2016-12-13 11:22:39 +11:00
Jorge Gonzalez
da251b8bc9 Change to one-line if statement 2016-12-12 17:57:49 -05:00
Jorge Gonzalez
6dbdaa4a63
Fix always charging bug 2016-12-12 16:40:03 -05:00
Dylan Araps
a173afb6ec Merge pull request #519 from dylanaraps/main_cleanup
General: Cleanup main
2016-12-12 23:57:06 +11:00
Dylan Araps
a3dc58347a Merge pull request #520 from dylanaraps/scrot2
Scrot: Use arrays for $scrot_program
2016-12-12 23:55:29 +11:00
Dylan Araps
2946e785db Merge pull request #521 from dylanaraps/cmus
Song: [cmus] Simplify block and fix artistsort bug
2016-12-12 23:54:18 +11:00
Dylan Araps
f7274fef87 General: Don't uppercase term font 2016-12-12 18:38:55 +11:00
Dylan Araps
f7e254d0d0 Song: Simplify state detection 2016-12-12 18:27:20 +11:00
Dylan Araps
c0355cea99 Song: [cmus] Simplify block and fix artistsort bug 2016-12-12 18:23:25 +11:00
Dylan Araps
a6e2bc9f8a General: Remove test comment 2016-12-12 18:00:53 +11:00
Dylan Araps
9be91cd8e3 Scrot: Quote unquoted var 2016-12-12 17:59:54 +11:00
Dylan Araps
0e8f6637dc General: Cleanup main 2016-12-12 17:41:35 +11:00
Dylan Araps
d08fdbf0e3 Fix test 2016-12-12 13:14:36 +11:00
Dylan Araps
0674f14125 Cache: Simplify caching 2016-12-12 13:10:08 +11:00
Dylan Araps
b205a4b5f2 Merge pull request #516 from konimex/master
Colors: use start++ instead of adding it manually after case
2016-12-10 23:56:50 +11:00
Muhammad Herdiansyah
66be054f30 Colors: use start++ instead of adding it manually after case 2016-12-10 19:52:07 +07:00
Dylan Araps
1a815a3789 Image: If $image_source is set to ascii display a warning in -v 2016-12-10 20:12:16 +11:00
Dylan Araps
7bd6eda49d Disk: Exit the function if the user doesn't have df installed 2016-12-10 19:22:26 +11:00
Dylan Araps
42cae93481 Fix conflicts 2016-12-09 16:20:10 +11:00
Dylan Araps
75df5c574e Ascii: Fix bug where OS X ascii was used on linux 2016-12-09 16:19:15 +11:00
Dylan Araps
c08ba009d7 General: Instead of running functions multiple time, log it 2016-12-09 15:20:40 +11:00
Dylan Araps
571d0c4df3 Images: Fix blank images in iTerm2, closes #513 2016-12-09 11:52:32 +11:00
Dylan Araps
926dea972b Images: Fix blank images in Iterm2, closes #513 2016-12-09 01:21:08 +11:00
Dylan Araps
d7e7e246e0 Shellcheck: Fix SC2068 and SC2086 2016-12-08 19:50:04 +11:00
Dylan Araps
ff5aaf342f Shellcheck: Fix SC2076 2016-12-08 19:24:58 +11:00
Dylan Araps
9aec102bcf General: cleanup 2016-12-08 19:09:52 +11:00
Dylan Araps
5e76bf8f1c Travis: Don't source files' 2016-12-08 19:09:09 +11:00
Dylan Araps
4d36341475 Travis: Point shellcheck to config files 2016-12-08 19:01:24 +11:00
Dylan Araps
9343a42a07 Version: Bump Neofetch to 2.1.0 2016-12-07 12:25:13 +11:00