Commit graph

396 commits

Author SHA1 Message Date
Dylan
bc53d2eafe Only look for w3m path if we're in image mode 2016-02-01 08:48:44 +11:00
Dylan
cec40577bf Fix leftover 'OSArchitecture' string 2016-02-01 08:42:12 +11:00
Dylan
d7722a3b46 Windows: Add support for showing architecture in 'Distro:' output. eg. 'Windows 7 Ultimate 64-bit' 2016-02-01 08:40:10 +11:00
Dylan
40366cb55b Further reduce the size of wmic commands 2016-02-01 08:31:22 +11:00
Dylan
70e88727b6 Shorten the equals fix 2016-02-01 08:24:25 +11:00
Dylan
e45664ae6d Fix cases where wmic prints an equals sign 2016-02-01 08:22:47 +11:00
Dylan
7b5b1b3a36 Windows: OS now shows Windows edition (Windows 7 Ultimate, etc) 2016-02-01 08:16:47 +11:00
Dylan
b16350893b Add comment about '--config off/none' 2016-02-01 08:00:20 +11:00
Dylan
b3a18ffaad Rename to 2016-01-31 21:33:02 +11:00
Tudor
db4838a2af Changed image cache location 2016-01-31 12:19:04 +02:00
Dylan
d4bd2b3d5e Lots of misc changes 2016-01-31 19:23:31 +11:00
Dylan
6c20e2c5d5 Remove some whitespace 2016-01-31 18:38:33 +11:00
Dylan
c44da9511c Don't create the directory until we know we can use image mode and remove broken underline option 2016-01-31 16:25:11 +11:00
Dylan
35369534b8 Fix GPU count 2016-01-31 13:16:50 +11:00
Dylan
2284cde0d8 GPU: Linux, count the number of GPUs 2016-01-31 12:52:28 +11:00
Dylan
c044bd788c Added Windows support to getbirthday 2016-01-31 11:10:13 +11:00
Dylan
5b16820363 Added NetBSD support to getbirthday 2016-01-31 11:02:32 +11:00
Dylan
404a25a063 OpenBSD: Disable pretty birthday output as 'date' doesn't have any of the flags we need 2016-01-31 10:45:56 +11:00
Dylan
09a3846738 Added OpenBSD support to getbirthday 2016-01-31 10:38:20 +11:00
Dylan
19be922cb9 Added birthday support to BSD 2016-01-31 10:31:29 +11:00
Dylan
c646a32fca Fixed double space before '@' sign in cpu info 2016-01-31 00:00:20 +11:00
Dylan
e5caad6abb Remove windows support from getbirthday 2016-01-30 23:58:14 +11:00
Dylan
2f2e9d387a Shorten windows cmd 2016-01-30 23:54:25 +11:00
Dylan
dac7f5768f Add windows support to getbirthday 2016-01-30 23:51:12 +11:00
Dylan
7ecd42fa09 Comment out birthday 2016-01-30 23:35:52 +11:00
Dylan
1149b3d6a6 Fix birthday output on OS X 2016-01-30 23:34:53 +11:00
Dylan
207af2ad53 Added birthday function 2016-01-30 22:41:58 +11:00
Dylan
825d5f68d2 Added experimental birthday function 2016-01-30 22:10:28 +11:00
Dylan
5542cc8ce1 Moved config to config/config 2016-01-30 21:26:08 +11:00
Dylan
eac81f3b48 Revert xprop support for getwindowmanager 2016-01-30 20:02:20 +11:00
Dylan
f035196886 Properly fallback to ascii mode if isn't a file 2016-01-30 17:55:31 +11:00
Dylan
bca479ecf3 Automatically find w3m-img path 2016-01-30 17:44:52 +11:00
Dylan
d683593c2d Add back missing space 2016-01-30 16:32:18 +11:00
Dylan
827c8b68d9 Fixed lint errors 2016-01-30 16:31:22 +11:00
Dylan
a40f4b644e Fix double space in linux cpu name 2016-01-30 14:37:50 +11:00
Dylan
f0416ec78e Window Manager: Added support for getting window manager with xprop 2016-01-30 12:56:37 +11:00
Dylan
c99d472ebb Added '--config off' and '--config none' to disable config files at launch 2016-01-30 12:05:53 +11:00
Dylan
c072c9a240 Added option to enable/disable config files and cleaned up comments in config 2016-01-30 11:30:21 +11:00
Dylan
91034c3d7e Better wording of config file comment 2016-01-30 11:09:36 +11:00
Dylan
8d5ccc76ad Space out if statement 2016-01-30 02:18:27 +11:00
Dylan
8dc36bbdcb Added config support 2016-01-30 02:14:29 +11:00
Dylan
a03a17a1a7 Fix if statement causing 'exit 1' 2016-01-30 01:07:01 +11:00
Dylan
18aa82afc8 Remove 'set -e' 2016-01-30 00:36:16 +11:00
Dylan
d836b67a1d Resolution: exit correctly 2016-01-30 00:34:48 +11:00
Dylan
9d8c0ca74c Fix errors with the script exiting with status '1' 2016-01-29 23:54:12 +11:00
Dylan
d7d16ecab2 Add a linebreak above title 2016-01-29 22:50:26 +11:00
Dylan
07084eb657 Fix stray forward slash in OS X GPU output. 2016-01-29 21:32:51 +11:00
Dylan
620454ae6e CPU: Added new substitution to cpu_shorthand 2016-01-29 18:32:23 +11:00
Dylan
7ebd67ca4f Combine ascii color rules for distros that share the same colors 2016-01-29 18:24:34 +11:00
Dylan
cd3cc49ca4 Add windows 10 logo 2016-01-29 18:16:14 +11:00
Dylan
f6114e96c2 Fixed ascii art and package detection on Linux Mint 2016-01-29 18:02:25 +11:00
Dylan
5a41a124c9 Fix ascii distro detection 2016-01-29 17:56:39 +11:00
Dylan
7af2f7e483 Added Crunchbang ascii, better handling of '--image' and '--ascii' when used without args and better handling if ascii file isn't found 2016-01-29 17:40:49 +11:00
Dylan
0e35c57e21 If images and ascii are off, don't clear the terminal 2016-01-29 17:07:17 +11:00
Dylan
6a3c4d4fb8 Add BSD shells to shell_version 2016-01-29 15:40:52 +11:00
Dylan
fc033b11d2 Fixed errors with empty '--image' and '--ascii' flags 2016-01-29 12:29:25 +11:00
Dylan
a2e9c7c0d7 OS X: Added wired memory to memory usage 2016-01-29 12:17:16 +11:00
Dylan
f7f2189b06 Swap all 'echo' to 'printf' for consistency 2016-01-29 11:41:23 +11:00
Dylan
cc907ed657 Set cursor position dynamically based on height of ascii and text 2016-01-29 11:35:04 +11:00
Dylan
2b640891eb Fix ascii fallback cursor position 2016-01-29 11:06:26 +11:00
Dylan
ab1fbf081e Added 'shell_path' and 'shell_version' to hide/show more info about '/bin/mksh' 2016-01-29 11:04:35 +11:00
Dylan
04d37437d8 Added 'kernel_shorthand', set it to 'off' to print more kernel info 2016-01-29 10:26:32 +11:00
Dylan
fcd4bad3c5 Only move cursor to the bottom of the terminal if w3m/iterm2 rendering is on 2016-01-29 10:11:34 +11:00
Dylan
55fcf79796 Check in /usr/share/fetch/ascii/ before falling back to script location 2016-01-29 09:45:35 +11:00
Dylan
9bde0eb888 Ascii art detection should now work on OS X 2016-01-29 02:03:15 +11:00
Dylan
c54775574f Fallback to ascii mode if w3m and/or imagemagick aren't installed 2016-01-29 00:00:08 +11:00
Dylan
651cc28f71 Fix another syntax error 2016-01-28 21:43:30 +11:00
Dylan
3a8f7d3cd3 Fix syntax error 2016-01-28 21:42:35 +11:00
Dylan
0af40be88e Set 'wall' back to default image source 2016-01-28 20:11:58 +11:00
Dylan
f3b777116c Readme 2016-01-28 20:11:18 +11:00
Dylan
c1fe11a926 [Experimental] Added the ability to display your distro's logo next to the info text (screenfetch mode). 2016-01-28 20:05:06 +11:00
Dylan
a0a7904fcc Added Max OS X build version 2016-01-28 12:44:06 +11:00
Dylan
84f6993987 Fix incorrect xinitrc path 2016-01-28 11:59:17 +11:00
Dylan
7619f71549 Added support for '$XINITRC' to getwindowmanager 2016-01-28 11:57:47 +11:00
Dylan
45b96fa550 Fix gtk3 theme detection 2016-01-28 11:34:41 +11:00
Dylan
7186bd31e7 Fix incorrect padding with unicode block charS 2016-01-28 10:26:14 +11:00
Dylan
9a40ded878 Readme 2016-01-28 10:18:18 +11:00
Dylan
e9cf6b7182 If imagemagick or w3m aren't installed disable images instead of continuing anyway 2016-01-28 08:57:25 +11:00
Dylan
2ed270b4da Fallback to using awk for line length on systems without 'wc -L' 2016-01-28 00:26:35 +11:00
Dylan
6382f49afe Fix padding escape codes on BSD systems and swap '\e' for '\033' 2016-01-27 23:42:21 +11:00
Dylan
5723f53250 pipe the file into 'wc' so that it doesn't print filename 2016-01-27 23:30:09 +11:00
Dylan
467e820e67 Don't use iTerm2 or w3m if ascii art is in use 2016-01-27 23:20:26 +11:00
Dylan
74b94e1769 Add ascii support to fetch 2016-01-27 22:33:22 +11:00
Dylan
039c9f60b1 Rename shuffledir to shuffle_dir 2016-01-27 15:01:48 +11:00
Dylan
548b54e633 Un-hardcode getgtk formatting and cleanup the function. Added choclatey support for Windows 2016-01-27 11:53:12 +11:00
Dylan
7d8f10d528 Add vim comment to set fold method 2016-01-26 23:09:38 +11:00
Dylan
a3446428e8 Added folds for function so that it's easier to navigate the script inside vim 2016-01-26 23:06:53 +11:00
Dylan
5145f40125 Remove check for 'df' as all OS we support will have it installed 2016-01-26 22:52:49 +11:00
Dylan
5048dda2aa Add comments with the optional info lines 2016-01-26 22:44:20 +11:00
Dylan
21a878de5a getdisk: Add Windows support and fix BSD detection 2016-01-26 22:31:00 +11:00
Dylan
07b2c83f9a Add fallback to getdisk 2016-01-26 22:25:08 +11:00
Dylan
7c0863db3d getdisk swap '/total/' for 'END' 2016-01-26 22:18:40 +11:00
Dylan
8b606395d1 Change printf to print in getdisk function 2016-01-26 21:43:01 +11:00
Dylan
21edcc0eb9 Added experimental disk usage 2016-01-26 21:25:28 +11:00
Dylan
2b04747804 Variable substitution, remove useless forward slashes and quotes 2016-01-26 17:44:31 +11:00
Dylan
92cda8174c Quote things that should be wrapped in quotes 2016-01-26 14:48:39 +11:00
Dylan
d20e7b3523 GPU: Added support for virtualbox gpu 2016-01-26 12:58:46 +11:00
Dylan
3c3e2cc571 Use cpufreq if available instead of hardcoding it to specific distros 2016-01-26 12:55:31 +11:00
Dylan
0e83e2099d Fixed gtk3 always printing theme instead of icons/font etc. Added new function 'gtkfont' to get the gtk theme's font, it's disabled by default and can be enabled like any other info line. Also sped up memory function on Linux. 2016-01-26 12:48:40 +11:00
Dylan
04280a688e Added new uptime_shorthand option called 'tiny'. It makes the output of uptime as small as possible eg: '1d 2h 35m' 2016-01-26 12:16:39 +11:00
Dylan
43416ebad5 Fix GPU fallback on OpenBSD 2016-01-26 10:54:07 +11:00
Dylan
a0c93da74d Readme 2016-01-26 09:35:12 +11:00
Dylan
a70db16a74 Readme changes 2016-01-25 21:43:33 +11:00
Dylan
f46aaf8672 Swap out tput stuff for ansi escape codes 2016-01-25 17:26:15 +11:00
Dylan
792030d00b GPU: Show 'Unknown' on unsupported OS 2016-01-25 10:51:06 +11:00
Dylan
8bb056fa02 Turns out that prompt_height disappeared a few days ago 2016-01-25 10:44:11 +11:00
Dylan
63bc62bf80 GPU support is now enabled by default, see issue #21 for more info 2016-01-25 10:37:29 +11:00
Dylan
96c35229f0 Added options to enable/disable GTK2/3 output for GTK theme. 2016-01-25 10:36:42 +11:00
Dylan
e5e0b4ccce Added commas 2016-01-25 09:07:53 +11:00
Dylan
20d99da018 Added more cpu speed types 2016-01-25 08:58:56 +11:00
Dylan
58b0cf9a90 Fix duplicated icon output on elementary OS 2016-01-25 01:22:45 +11:00
Dylan
ef626b2c36 Add trailing space to gtk3 output 2016-01-25 01:18:31 +11:00
Dylan
2359a3ce2e Added comma to gtk theme output 2016-01-25 01:14:35 +11:00
Dylan
ca0d661fc8 Fixed incorrect GTK3 theme 2016-01-25 01:10:05 +11:00
Dylan
5885c3033e Reformat gpu_shorthand 2016-01-24 23:38:50 +11:00
Dylan
7e42f0c5c3 Fix trailing whitespace in cpu name 2016-01-24 23:36:54 +11:00
Dylan
b80b09376a Spaced out some if statements to make them more readable 2016-01-24 22:59:35 +11:00
Dylan
4cd78d3148 Fix issue where w3m couldn't display an image without a file extension 2016-01-24 11:17:48 +11:00
Dylan
10843ffabb ... 2016-01-24 11:09:44 +11:00
Dylan
fcf7a3fca4 ... 2016-01-24 11:06:06 +11:00
Dylan
b9b3f05fab getwallpaper: Also check that .fehbg exists 2016-01-24 11:05:08 +11:00
Dylan
5996edbc9d getwallpaper: Added gsettings support 2016-01-24 11:03:29 +11:00
Dylan
45b72832bb ... 2016-01-24 10:50:39 +11:00
Dylan
dcadf98d3d ... 2016-01-24 10:46:12 +11:00
Dylan
76fc53bb14 ... 2016-01-24 10:45:43 +11:00
Dylan
6a59d33581 Fixed leading whitespace issue 2016-01-24 10:44:29 +11:00
Dylan
b5deb6b255 Really really fix whitespace issue 2016-01-24 10:40:45 +11:00
Dylan
f1e1915a08 Really fix whitespace issue 2016-01-24 10:38:46 +11:00
Dylan
d480966172 Fix whitespace issue with gtk3 theme fallback 2016-01-24 10:35:32 +11:00
Dylan
936aeab35a Fix whitespace issue if gtk2 theme wasn't found 2016-01-24 10:33:02 +11:00
Dylan
aa4395279d getgtk: Better theme detection 2016-01-24 10:30:33 +11:00
Dylan
b30e6e6d18 Fix typo in gtk icon fallback 2016-01-24 10:17:03 +11:00
Dylan
771ead2701 Fixed missing forward slash 2016-01-24 10:15:43 +11:00
Dylan
2daaa57f3a getgtk fallback to gsettings detection for gtk3 theme/icons 2016-01-24 10:14:32 +11:00
Dylan
f33124b583 Remove flags that broke in the printinfo function changes 2016-01-24 08:46:21 +11:00
Dylan
7b524080d4 Make notes about '--gap' supporting a negative value 2016-01-24 08:40:01 +11:00
Dylan
0b75228f60 Fixed cpu speed on elementary, Added more rules to getgpu for AMD cards 2016-01-24 08:16:06 +11:00
Dylan
bd230f31f7 Add elementary support to getpackage 2016-01-24 08:09:22 +11:00
Dylan
ab92616da8 wmctrl is now used by default if found 2016-01-23 10:31:24 +11:00
Dylan
a81ef5c0f9 --scrot now takes a path/file 2016-01-23 10:28:16 +11:00
Dylan
b01c7b2202 Turns out that the screenshot stuff was still broken 2016-01-23 10:16:34 +11:00
Dylan
0171d3e343 Turns out that the screenshot launch flags didn't actually work 2016-01-22 21:28:06 +11:00
Dylan
f13ea88dde Update docs 2016-01-22 18:04:53 +11:00
Dylan
7577752047 Changed all 'print' to 'printf' 2016-01-22 15:12:43 +11:00
Dylan
61661095a0 Suppress lsb_release errors 2016-01-21 22:22:29 +11:00
Dylan
31b1ce0bf1 Remove blank XP case 2016-01-21 20:45:08 +11:00
Dylan
33b5b2ef60 Remove gpu support for NetBSD 2016-01-21 20:42:25 +11:00
Dylan
30f7146786 Add gpu support for NetBSD 2016-01-21 20:41:03 +11:00
Dylan
2cd4879fb3 Fixed images disappearing in vte based terminals. Closes #18 2016-01-21 13:23:16 +11:00
Dylan
8fb27be14f Remove exclude option as it no longer works 2016-01-21 12:29:45 +11:00
Dylan
ab55150101 GTK Theme Detection: Exclude commented lines from output 2016-01-21 11:29:24 +11:00
Dylan
3459833a62 Restore cursor and clear screen on ctrl+c 2016-01-21 10:56:55 +11:00
Dylan
f7c37dd934 Add color function 2016-01-21 09:49:50 +11:00
Dylan
9daacddda1 You can now use ANY bash syntax when customizing what gets displayed, for example you could use an if statment to only show info when condition is true! 2016-01-21 08:58:50 +11:00
Dylan
c5c34637b8 Hopefully fixed blank gpu with nvidia cards 2016-01-21 07:20:42 +11:00
Dylan
19b4861e83 Fix cpu speed on CentOS 2016-01-21 00:41:15 +11:00
Dylan
db26756ea7 Turns out we only supported bash 4.3, this commit swaps typeset for eval 2016-01-21 00:37:31 +11:00
Dylan
928bbf0760 Fix hang when wallpaper is empty 2016-01-20 21:48:38 +11:00
Dylan
868344c1a4 Fix hang when wallpaper isn't found 2016-01-20 21:46:20 +11:00
Dylan
153f804626 getwallpaper: Add nitrogen support 2016-01-20 21:35:32 +11:00
Dylan
a9e3db5d8f Add cmus support to getsong 2016-01-20 21:24:29 +11:00
Dylan
9729361a3e Add cmus support to getsong 2016-01-20 21:24:04 +11:00
Dylan
d05020404f getgpu: Made the function more reliable and added support for nvidia-smi (untested) 2016-01-20 09:17:54 +11:00
Dylan
b36385d53d Fixed *buntu cpu speed on multicore cpus 2016-01-19 22:33:25 +11:00
Dylan
ba88942bcd Fixed missing * 2016-01-19 22:31:33 +11:00
Dylan
515e2fb886 Fix cpuspeed on *buntu based systems 2016-01-19 22:30:17 +11:00
Dylan
4096d3c988 gpu_shorthand: remove more stuff 2016-01-19 19:33:52 +11:00
Dylan
d521f5168e Remove duplicate lines in BSD cpu detection 2016-01-19 17:36:10 +11:00
Dylan
f4982c76f5 Added cpu speed for FreeBSD 2016-01-19 17:33:41 +11:00
Dylan
0ae45fb404 Display the image before the text and reset cursor position before printing text 2016-01-19 17:08:00 +11:00
Dylan
f26d2870cb Iterm2 rendering should work take 2 2016-01-19 16:56:43 +11:00
Dylan
b40b0b1d4f iterm2 image rendring should work now. 2016-01-19 16:42:52 +11:00
Dylan
7e042c4b5a Added untested support for iterm2 image rendering 2016-01-19 14:21:38 +11:00
Dylan
c2612b8d8c Fix gpu spacing in FreeBSD 2016-01-19 13:57:29 +11:00
Dylan
10c3ff2d3e Move gpu shorthand 2016-01-19 13:52:33 +11:00
Dylan
76c3e949fe Add GPU support for Linux. Needs testing so bad. 2016-01-19 13:49:30 +11:00
Dylan
f3b3383781 GPU: Now fully works on Windows 2016-01-19 12:22:32 +11:00
Dylan
b86f014099 GPU: Now fully works on Windows 2016-01-19 12:21:20 +11:00
Dylan
f9f32ef28b GPU: Added support for OS X and Windows 2016-01-19 12:12:41 +11:00
Dylan
96c62b0774 GPU: Now works on FreeBSD 2016-01-19 12:02:04 +11:00
Dylan
460f798d13 Added gpu support base 2016-01-19 11:55:45 +11:00
Dylan
b7bb03b6ab Wildcard linux distros in getpackages 2016-01-19 11:42:31 +11:00
Dylan
eb8f115df4 Arch package count: Disable colored output and hide versions 2016-01-19 11:24:56 +11:00
Dylan
ae46d6f895 NetBSD: Actually fix whitespace issue 2016-01-19 11:17:45 +11:00
Dylan
7e073ef573 Fix whitespace issue with NetBSD cpu speed 2016-01-19 11:15:37 +11:00
Dylan
0b8587cc24 NetBSD: cpu speed 2016-01-19 11:12:38 +11:00
Dylan
45f0204d7b NetBSD: Fix CPU name and Memory usage 2016-01-19 11:05:43 +11:00
Dylan
4e275bf66d revert whitespace changes 2016-01-19 10:45:56 +11:00
Dylan
3ff01a0154 Fix package whitespace 2016-01-19 10:44:25 +11:00
Dylan
aa8e64c1be Added lsb_release to distro detection 2016-01-19 10:42:41 +11:00
Dylan
c53235dc90 Fix cursor move issue on *BSD and remove ';;&' from printinfo 2016-01-19 09:54:03 +11:00
Dylan
f3bc7145e4 Readme 2016-01-18 18:21:57 +11:00
Dylan
27ee879d25 Fix memory detection on OpenBSD 2016-01-18 17:48:27 +11:00
Dylan
f2be7906ec Fix memory detection on OpenBSD 2016-01-18 17:47:31 +11:00
Dylan
04ba1d2c3b Fix memory usage on BSD 2016-01-18 17:45:32 +11:00
Dylan
b6b4e09287 Fix FreeBSD mem free 2016-01-18 17:39:23 +11:00
Dylan
6f1ed5c0b7 Turns out other *BSD distros don't have hw.cpuspeed 2016-01-18 17:37:00 +11:00
Dylan
432eb89e2d Added cpu speed for *BSD 2016-01-18 17:30:00 +11:00
Dylan
08ea6945fa Added empty text for getresolution 2016-01-18 17:24:08 +11:00
Dylan
10be9f4759 Fix free memory on OpenBSD 2016-01-18 17:21:32 +11:00