Commit graph

1109 commits

Author SHA1 Message Date
Dylan Araps
306fe9caa6 Memory: [Haiku] Simpler memory command 2016-11-05 12:03:00 +11:00
Dylan Araps
03aebe277c Merge #414 2016-11-05 11:53:18 +11:00
Dylan Araps
e9059f8e24 Disk: Disable disk in Haiku 2016-11-05 11:51:05 +11:00
Dylan Araps
09aa5b9ba9 Haiku: Fix battery again 2016-11-05 11:51:05 +11:00
Dylan Araps
fd8994b938 Haiku: Fix battery usage 2016-11-05 11:51:05 +11:00
Dylan Araps
68a14e5b1f Haiku: Added battery support 2016-11-05 11:51:05 +11:00
Dylan Araps
f637bbfe7b Merge #419 2016-11-05 11:46:08 +11:00
Dylan Araps
8711f1bfaf Merge pull request #423 from dylanaraps/tux
Ascii [Linux] Add tux ascii art if distro ascii art doesn't exist
2016-11-05 11:05:38 +11:00
Dylan Araps
fbedf02007 Merge branch '2.0' of https://github.com/dylanaraps/neofetch into 2.0 2016-11-05 11:04:57 +11:00
Dylan Araps
040a964833 Merge master 2016-11-05 11:04:52 +11:00
Dylan Araps
8bcfa43089 Ascii [Linux] Add tux ascii art if distro ascii art doesn't exist 2016-11-05 10:29:21 +11:00
Dylan Araps
a14cba7068 Terminal Font: Add HyperTerm support 2016-11-05 09:52:11 +11:00
Jorge Gonzalez
1830f9651b macOS Sierra (HyperTerm): Add termfont detection 2016-11-04 17:44:44 -04:00
Jorge Gonzalez
a63a6a6b1d macOS Sierra (HyperTerm): Add terminal detection 2016-11-04 17:44:12 -04:00
Dylan Araps
9f16ba9aa1 Merge pull request #420 from konimex/ascii
ASCII: Added Korora and Netrunner
2016-11-05 00:37:45 +11:00
Muhammad Herdiansyah
d160a2ee03 ASCII: Added Netrunner 2016-11-04 19:33:16 +07:00
Muhammad Herdiansyah
1fa37fa274 ASCII: Added Korora 2016-11-04 19:33:16 +07:00
Dylan Araps
7fbe91e8e8 General: Fix issue with no info printed if whitespace was in the output 2016-11-04 20:09:27 +11:00
Dylan Araps
edfdbf05a4 Merge pull request #406 from dylanaraps/distro3
Distro: [Linux] Source *ease files
2016-11-04 18:56:36 +11:00
Dylan Araps
564b0f889e Docs: Change version 2016-11-04 18:45:02 +11:00
Dylan Araps
e912d35b34 Remove --test 2016-11-04 17:42:32 +11:00
Dylan Araps
5585eaa8b8 General: If something can't be detected let the user know in verbose mode 2016-11-04 14:49:50 +11:00
Dylan Araps
4cea604b86 Termfont: Simpler awk commands 2016-11-04 13:44:37 +11:00
Dylan Araps
3a0c82ebc5 Merge branch 'master' of https://github.com/dylanaraps/neofetch 2016-11-03 11:14:59 +11:00
Dylan Araps
2b3940adb9 Memory: [OpenBSD] Fix OpenBSD memory usage - @Head-on-a-Stick (Closes #413) 2016-11-03 11:14:34 +11:00
Fredrik Fornwall
7ebd6dacba Android (Termux): Fix default config location 2016-11-02 16:18:45 +01:00
Dylan Araps
bd0dd91973 General: Add support for BlankOn Linux 2016-11-02 17:40:50 +11:00
Dylan Araps
ba4b541167 Image: Fix cursor position in URxvt when using terminal padding 2016-11-02 17:17:09 +11:00
Dylan Araps
5cede165cf WM Theme: Use double quotes 2016-11-02 15:56:00 +11:00
Dylan Araps
e8ab7ea88d Remove stray newline 2016-11-02 15:49:52 +11:00
Dylan Araps
2705f23248 Merge branch 'master' of https://github.com/dylanaraps/neofetch 2016-11-02 14:41:57 +11:00
Dylan Araps
0c28f8c3f6 WM Theme: Don't print Mutter (Budgie) wm theme 2016-11-02 14:41:39 +11:00
Dylan Araps
a687096bc2 Merge pull request #411 from konimex/master
Various updates for Android/Termux
2016-11-02 13:29:29 +11:00
Herdiansyah
ebf5f6345a Android (Termux): Fixed ASCII not appearing 2016-11-02 08:21:15 +07:00
Dylan Araps
651d38c949 Theme: Misc fixes 2016-11-02 10:16:16 +11:00
Dylan Araps
1505ed5d68 Theme: [Budgie] Fix incorrect GTK Theme/Icons 2016-11-02 10:10:40 +11:00
Dylan Araps
013e9d6652 Termfont: [Linux] Fix whitespace issue 2016-11-02 09:52:46 +11:00
Dylan Araps
453a38d79f Images: Fix Division by 0 error. Closes #410 2016-11-02 09:44:25 +11:00
Dylan Araps
7b2dcea117 Termfont: [Termite] Fix incorrect font choses. Closes #409 2016-11-02 09:39:37 +11:00
Dylan Araps
462d4c594a prin: Fix bold not working, Add prin tests to travis 2016-11-02 00:54:52 +11:00
Dylan Araps
00f22df3c8 prin: Revert bold fix 2016-11-02 00:41:52 +11:00
Dylan Araps
6ada4c7fb8 prin: Fix bold not working, Fix color breakage. Closes #407 2016-11-02 00:37:54 +11:00
Dylan Araps
e0fff44cce Distro: [Linux] Fallback only print first line 2016-11-01 23:23:11 +11:00
Dylan Araps
dcdf6190c8 Distro: [Linux] Fix incorrect quoting 2016-11-01 23:09:21 +11:00
Dylan Araps
b1b6226189 Distro: [Linux] Fix fallbacks not working 2016-11-01 23:05:30 +11:00
Dylan Araps
29ccbb2a31 Remove stray line 2016-11-01 23:00:14 +11:00
Dylan Araps
d45002ca15 Distro: [Linux] Also look in /usr/lib/*ease 2016-11-01 22:47:27 +11:00
Dylan Araps
f8f50f6b1d Distro: [Linux] Source /etc/*ease files 2016-11-01 22:43:22 +11:00
Dylan Araps
a37a3eec31 Update docs 2016-11-01 17:57:08 +11:00
Dylan Araps
921f0975f1 General: Red Star OS fixes 2016-11-01 11:43:06 +11:00
Kim Myung-ki
85eef19406 레드 스타 OS에 대한 도움 탐지
친애하는 지도자 김정일의 위대한 후계자가 김정은이 프로그램 neofetch에
영광스러운 붉은 별의 검출을 추가 요구했다, 당신은 더 나은 자신의
명령을주의 나 기회가 될!

Signed-off-by: Korea Computer Center <admin@kcc.net.kp>
2016-10-31 23:22:51 +07:00
Muhammad Herdiansyah
c47d095a38 Expanded distro_shorthand to *BSDs 2016-10-31 20:47:32 +07:00
Dylan Araps
dcf51866ec Merge branch 'master' of https://github.com/dylanaraps/neofetch 2016-10-31 14:57:22 +11:00
Dylan Araps
194c7b500d Images: Use \033[14t before falling back to external programs 2016-10-31 14:57:04 +11:00
Muhammad Herdiansyah
2f46385cf0 GPU: Used FreeBSD's method for DragonFlyBSD and PacBSD 2016-10-30 23:40:52 +07:00
Dylan Araps
e408e6f8d7 Kernel: Remove kernel_shorthand tiny 2016-10-30 20:55:14 +11:00
Dylan Araps
c667fca505 Kernel: Hardcode kernel_shorthand=tiny on BSD systems 2016-10-30 17:40:43 +11:00
Dylan Araps
5959cb1b93 Image: If terminal size is less than or equal to 10 fallback to ascii mode 2016-10-30 14:20:01 +11:00
Dylan Araps
0be5f01291 Image: If terminal width is 0, fallback to ascii mode 2016-10-30 14:08:48 +11:00
Dylan Araps
0a2c9a5a6b Misc: Don't uppercase Terminal and WM output 2016-10-29 16:50:48 +11:00
Dylan Araps
ec0ed23d11 Term: Add a fallback to ps. 2016-10-29 16:02:24 +11:00
Dylan Araps
a06329db1b getterm: Use /proc/$PPID/comm instead of ps 2016-10-29 15:19:04 +11:00
Dylan Araps
7c327683a8 Kernel: Print kernel name by default 2016-10-29 14:33:36 +11:00
Dylan Araps
0871c362ef Windows 10 (bash): Fix battery 2 2016-10-29 11:47:00 +11:00
Dylan Araps
7735fb02a5 Windows 10 (bash): Fix battery usage 2016-10-29 11:41:50 +11:00
Dylan Araps
63198a2209 Uptime: Remove 'up' 2016-10-27 09:45:55 +11:00
Dylan Araps
51354b2235 Merge pull request #322 from dylanaraps/android2
Add Android support 2
2016-10-27 09:30:23 +11:00
Dylan Araps
b8502a8b44 Ascii: Fix colors on light terminals 2016-10-27 08:20:20 +11:00
Dylan Araps
e8e859b590 Merge master 2016-10-27 08:09:08 +11:00
Dylan Araps
785a22520b Merge pull request #398 from dylanaraps/gpu
GPU: [Linux] Rewrite GPU
2016-10-26 23:50:57 +11:00
Dylan Araps
64b8e02812 Fix 2016-10-26 23:50:54 +11:00
Dylan Araps
8cbf7e7feb Remove GPU shorthand 2016-10-26 23:41:17 +11:00
Dylan Araps
4e7955bc94 Cache GPU output 2016-10-26 23:22:08 +11:00
Dylan Araps
b2d17711f9 GPU: Add brand 2016-10-26 23:16:57 +11:00
Dylan Araps
0177837f69 GPU: Start rewrite 2016-10-26 22:48:20 +11:00
Dylan Araps
eee8ac7f8e Merge pull request #396 from dylanaraps/song
Song: Rewrite song function
2016-10-26 21:20:05 +11:00
Dylan Araps
6f41167eb5 Song: Fix iTunes 2 2016-10-26 21:18:46 +11:00
Dylan Araps
9889ba14cb Song: Fix iTunes 2016-10-26 21:04:58 +11:00
Dylan Araps
314c254794 Docs: misc 2016-10-26 18:24:37 +11:00
Dylan Araps
bf67d5be11 Docs: Remove battery options 2016-10-26 18:23:15 +11:00
Dylan Araps
43ac9dfcb2 Docs 2016-10-26 18:22:08 +11:00
Dylan Araps
0c41c285a7 Fix processes with paths in name' 2016-10-26 18:09:59 +11:00
Dylan Araps
b23ccd6709 Battery: [Linux] Rewrite battery 2016-10-26 17:56:50 +11:00
Dylan Araps
931660d31a Remove pointless if
"
2016-10-26 15:38:45 +11:00
Dylan Araps
efa55b28b0 Rewrite getsong 2016-10-26 15:18:11 +11:00
Dylan Araps
252d56ab49 Reduce sise of iOS GPU function 2016-10-26 11:29:46 +11:00
Dylan Araps
fa312af1ee Misc fixes/changes 2016-10-26 11:18:37 +11:00
Dylan Araps
cc9095ccd5 Refactor GPU 2016-10-25 10:39:56 +11:00
Dylan Araps
ab1de702f9 Distro: Simplify shorthand for lsb_release 2016-10-25 10:30:41 +11:00
Dylan Araps
192014ca9f Model: Remove useless use of cat 2016-10-25 10:25:10 +11:00
Muhammad Herdiansyah
e92e691751 SUSE: Changed ASCII behavior
In SUSE's `lsb_release`, they have different behavior for `-ir` and
`-d`, one output will be `openSUSE Leap 42.1` and the other will be
`SUSE LINUX 42.1`. This new behavior would also extend compatibility
with SUSE Linux Enterprise.
2016-10-24 22:09:57 +07:00
Dylan Araps
c869e81e3b Fix w3m-img being used even when images were off 2016-10-24 08:53:54 +11:00
Muhammad Herdiansyah
24e7216777 Solaris: Strip out crap from getdistro output 2016-10-23 18:51:12 +07:00
Muhammad Herdiansyah
d39bebb2a4 Solaris: Unified package detection with Linux
Some OpenSolaris/illumos-based distribution used various Linux package
managers such as dpkg, rpm, and portage (see more at
http://wiki.illumos.org/display/illumos/Distributions). It would make
sense for Solaris' case to be unified with Linux.

However, Linux's `pkg` detection (I don't know which distro is that) are
vastly different from Oracle Solaris/OpenIndiana's `pkg`, so a
workaround is used.
2016-10-23 18:51:04 +07:00
Dylan Araps
09a4ac132e Simplify cursor positioning 2016-10-23 14:08:45 +11:00
Dylan Araps
d09cf58790 Cursor Position: Fix issues when using URxvt+Padding 2016-10-23 13:47:49 +11:00
Dylan Araps
5dddaa0b26 GPU: Remove duplicate substitutions 2016-10-23 11:22:17 +11:00
Dylan Araps
f4b266b5c6 CPU Speed: Don't use read 2016-10-23 11:13:40 +11:00
Dylan Araps
49cdb2f95c Linux: Correctly calculate memory usage 2016-10-23 11:03:46 +11:00
Dylan Araps
664556d137 Test mode: Show CPU temp 2016-10-23 09:51:16 +11:00
Dylan Araps
3ef6aeea42 Linux: Add CPU temperature 2016-10-23 09:45:03 +11:00
Dylan Araps
6457b3276f Windows: Print DE 2016-10-23 09:07:04 +11:00
Dylan Araps
a59cf169e4 Cmus: Fix broken output, closes #389 2016-10-22 23:14:54 +11:00
Dylan Araps
fe8e15d5d6 Simplify cursor position 2016-10-22 20:25:41 +11:00
Dylan Araps
17d17f4480 Theme: Fix gtk2/3 comparison when whitespace is involved 2016-10-22 19:59:25 +11:00
Dylan Araps
919da27716 Added support for Porteus, closes #388 2016-10-22 15:19:56 +11:00
Dylan Araps
0fb2b661ba Song: Add support for Audacious. @ncmprhnsbl 2016-10-22 15:11:52 +11:00
Dylan Araps
92595e8bc6 Fix cursor artifacts in termux 2016-10-22 10:20:14 +11:00
Dylan Araps
ad3a90219a Fix cursor artifcats in termux 2016-10-22 10:18:38 +11:00
Dylan Araps
fd957835b7 Merge branch 'master' into android2 2016-10-22 10:16:10 +11:00
Dylan Araps
79392d75a9 Sigh 2016-10-22 10:15:47 +11:00
Dylan Araps
d1ef3ab4e8 Merge branch 'master' into android2 2016-10-22 10:11:38 +11:00
Dylan Araps
ad2b18ef07 Count line breaks when calculating cursor position 2016-10-22 10:11:18 +11:00
Dylan Araps
8bc6b2d183 Merge branch 'master' into android2 2016-10-22 09:52:26 +11:00
Dylan Araps
50f87a4233 Fix cursor bugs if ascii art is taller than info 2016-10-22 09:51:58 +11:00
Dylan Araps
0b5d25d9b5 Fix cursor bugs if ascii art is taller than info 2016-10-22 09:49:59 +11:00
Dylan Araps
bb01418dca Merge master 2016-10-22 01:39:31 +11:00
Dylan Araps
a34d64b43b Revert color blocks change as it caused issues in tty 2016-10-22 01:35:28 +11:00
Dylan Araps
bcb51ee7aa Add more deprecated flags to checkoldflags() 2016-10-22 01:27:39 +11:00
Dylan Araps
60beb88def w3m-img: Add -bg support 2016-10-22 01:14:02 +11:00
Dylan Araps
b12e5b1f56 Fix yoffset bug 2016-10-22 01:05:47 +11:00
Dylan Araps
a564b19aeb Fix cursor bugs and use yoffset in calculations 2016-10-22 00:42:34 +11:00
Dylan Araps
76f7b4025e w3m-img: Draw the image twice 2016-10-22 00:06:51 +11:00
Dylan Araps
5270e97943 Merge branch 'master' into img 2016-10-22 00:03:05 +11:00
Dylan Araps
d9e15e3597 Merge pull request #380 from dylanaraps/uptime-fix
Rewrite uptime for Linux/Windows/Solaris to match macOS/BSD
2016-10-21 23:45:25 +11:00
Dylan Araps
6c50efa75b term: Don't print output of busybox ps 2016-10-21 21:48:17 +11:00
Dylan Araps
4619eba654 Don't do any dynamic prompt stuff in image off mode 2016-10-21 21:45:32 +11:00
Dylan Araps
6a37a9bb11 Merge pull request #381 from dylanaraps/cores
Add option to hide/show hyperthreaded cpu cores.
2016-10-21 21:35:00 +11:00
Dylan Araps
c804f7835e Image mode: Add support for terminal emulators that don't support \033[14t 2016-10-21 21:25:43 +11:00
Muhammad Herdiansyah
e4c7f1926a Solaris: Rewritten uptime
Solaris' uptime will now show the second mark only so we don't have 2
case instances.
2016-10-21 16:29:31 +07:00
Dylan Araps
3123548c18 Update docs 2016-10-21 20:29:16 +11:00
Dylan Araps
9882165617 Add support for Solaris 2016-10-21 20:27:35 +11:00
Dylan Araps
7b62b8091c revert old logo 2016-10-21 19:01:25 +11:00
Dylan Araps
edb6920df9 New android logo 2016-10-21 18:54:37 +11:00
Dylan Araps
5f4e9e5d8e merge master 2016-10-21 18:42:25 +11:00
Dylan Araps
e11d40cd00 solaris: Fix term 2016-10-21 18:37:59 +11:00
Dylan Araps
ad47e456e3 Fix term on solaris 2016-10-21 18:36:32 +11:00
Dylan Araps
5a96327fa3 Only use zero width space in image mode 2016-10-21 18:35:17 +11:00
Dylan Araps
6e47608bc5 Don't do any dynamic prompt stuff in image off mode 2016-10-21 18:09:25 +11:00
Dylan Araps
b13da1d999 Fix C locale padding issues 2016-10-21 18:02:04 +11:00
Dylan Araps
7bdf5f1168 Fix bug with block chars 2016-10-21 17:19:03 +11:00
Dylan Araps
93abca7185 Make note about support 2016-10-21 16:54:05 +11:00
Dylan Araps
bd44f1ea12 Fix grammar error 2016-10-21 16:40:58 +11:00
Dylan Araps
66100fc351 Use cpu_cores 2016-10-21 16:38:02 +11:00
Dylan Araps
dc32c0b71c Add option to hide/show hypertheaded cpu cores 2016-10-21 16:26:34 +11:00
Dylan Araps
1a8734bf46 macOS: Show hyperthreaded cores 2016-10-21 15:16:02 +11:00
Dylan Araps
e5359dc314 Fix terminal output on android 2016-10-21 14:45:36 +11:00
Dylan Araps
99d43ff257 Add seconds when uptime is below 1 min 2016-10-21 10:37:40 +11:00
Dylan Araps
c2e6f6534d Fix errors on large uptimes 2016-10-21 10:20:28 +11:00
Dylan Araps
fb7b3c146e Rewrite uptime 2016-10-21 10:00:09 +11:00
Dylan Araps
7862e3af5a Fix bugs 2016-10-21 09:15:03 +11:00
Dylan Araps
7a661b3966 Fix bugs 2016-10-20 17:32:29 +11:00
Dylan Araps
0e87355eb0 merge master 2016-10-19 20:54:30 +11:00
Dylan Araps
d1b2b2828f Remove path from terminal name 2016-10-18 08:23:03 +11:00
Dylan Araps
805b7d2e84 Fix bug 2016-10-17 23:59:54 +11:00
Dylan Araps
2abdbfc2bc Condense osx_version 2016-10-17 23:48:30 +11:00
Dylan Araps
03e6e8c992 Fix 2016-10-17 19:55:41 +11:00
Dylan Araps
20de28779d Fix 2016-10-17 19:52:31 +11:00
Dylan Araps
a76bd6b913 Fix 2016-10-17 19:51:00 +11:00
Dylan Araps
2a4f82a317 Show bbLean instead of Blackbox 2016-10-17 19:47:48 +11:00
Dylan Araps
14bba15f9a Show explorer theme for other Wms/Shells 2016-10-17 19:22:15 +11:00
Dylan Araps
1799ad84b8 Fix path errors 2016-10-17 19:15:42 +11:00
Dylan Araps
1136ca820c Fix path errors 2016-10-17 19:14:19 +11:00
Dylan Araps
3ab1b9326b wmtheme: Add support for Blackbox 2016-10-17 19:02:53 +11:00
Dylan Araps
2d9dbaa4bb Merge pull request #373 from dylanaraps/winwm
wm: Add support for Windows WMs and Shells
2016-10-17 18:45:07 +11:00
Dylan Araps
4be66e94bd wm: Add support for Windows WMs and Shells 2016-10-17 18:39:56 +11:00
Andrew Titmuss
21144eb973
fix iTunes automatically opening 2016-10-17 16:53:30 +11:00
Dylan Araps
71ece3de5b Fix disk output on MacOS 2016-10-17 08:07:04 +11:00
Dylan Araps
48819dc592 Fix glitched line endings on long lines 2016-10-17 00:07:30 +11:00
coypoop
04685755c1 physmem is 32bit on netbsd, physmem64 for 64bit 2016-10-16 09:01:16 +03:00
Muhammad Herdiansyah
294b5f34e7 Added support for Bitrig 2016-10-16 09:50:22 +07:00
Dylan Araps
f275d53fa6 Fix broken block_width 2016-10-16 10:44:05 +11:00
Dylan Araps
a9f74d9d01 Add support for Sparky Linux 2016-10-16 09:38:56 +11:00
Andrew Titmuss
2010d11328
shorten if statement for retina check 2016-10-16 00:45:27 +11:00
Andrew Titmuss
52e0884250
remove test from if statement 2016-10-16 00:43:20 +11:00
Andrew Titmuss
6f004a244f
macOS: add @2x label for retina resolutions 2016-10-16 00:39:07 +11:00
Dylan Araps
084541fe34 Merge pull request #364 from iandrewt/hyperthreading-fix
fix macOS to show physical cores
2016-10-15 23:56:41 +11:00
Andrew Titmuss
85d1c31dce
change all references to Mac OS X to macOS 2016-10-15 23:20:25 +11:00
Andrew Titmuss
50a2bdcc95
fix macOS to show physical cores 2016-10-15 22:57:45 +11:00
Dylan Araps
5e167e4c02 Uppercase without function 2016-10-15 22:07:12 +11:00
Dylan Araps
30d808c52d Fix function in bash 3 2016-10-15 22:01:15 +11:00
Dylan Araps
a8ccdf6a65 Uppercase first letter of info 2016-10-15 21:45:19 +11:00
Muhammad Herdiansyah
710fd49887 Added function to check if old flags is still present on configs 2016-10-15 13:19:52 +07:00
Muhammad Herdiansyah
fe6588d8b6 Expanded distro_shorthand to Solaris 2016-10-15 13:19:52 +07:00
Muhammad Herdiansyah
ed41c15c6a Expanded distro_shorthand to Mac OS X 2016-10-15 13:19:49 +07:00
Dylan Araps
cce254d338 Fix incorrect font name on XFCE 2016-10-13 23:47:35 +11:00
Dylan Araps
3e9c3d648c Fixed rendering issues with URxvt and XFT fonts, thanks Konimex 2016-10-12 21:19:40 +11:00
Dylan Araps
ee3630af40 Fix image off prompt location 2016-10-12 17:55:51 +11:00
Muhammad Herdiansyah
b7256fb48a Removed "Windows" from os_arch description.
To preserve accuracy, os_arch's description will be changed accordingly
so there will be no notion that os_arch is Windows' exclusive.
2016-10-07 17:44:39 +07:00
Muhammad Herdiansyah
aa7e185d17 Solaris: Better awk without gsub 2016-10-05 22:06:54 +07:00
Dylan Araps
e86ce55822 GPU: Cleanup substitutions 2016-10-05 09:29:54 +11:00
Dylan Araps
abf9b5d257 Fix incorrect cursor position when using small ascii art 2016-10-05 08:15:20 +11:00
Dylan Araps
7f5f05b441 Remove stray line 2016-10-04 21:30:03 +11:00
Dylan Araps
934b08b6f8 Re-add w3m-img line wrap fix 2016-10-04 21:29:06 +11:00
Dylan Araps
be2d486c41 Fix broken progress bars 2016-10-04 09:43:51 +11:00
Dylan Araps
8ea306652d Fix issues with single args 2016-10-04 08:48:33 +11:00
Dylan Araps
06281daed8 Fix merge conflicts 2016-10-04 08:39:00 +11:00
Dylan Araps
dfb8a94303 Finish documentation for scrot upload 2016-10-04 08:26:31 +11:00
Dylan Araps
e9a08a074d Merge pull request #349 from dylanaraps/img-fix
Add a tiny sleep to fix image flashing and not drawing properly
2016-10-04 07:55:18 +11:00
Dylan Araps
31ae13d296 Merge pull request #350 from dylanaraps/logo-mode
Logo mode - Only print ascii art.
2016-10-03 21:51:56 +11:00