Commit graph

401 commits

Author SHA1 Message Date
Dylan
438d5e0542 GTK: Fix xfce case 2016-02-08 23:37:14 +11:00
Dylan
f15f5728ea Rewrite getgtk to also check DE 2016-02-08 23:29:48 +11:00
Dylan
0d78a6bdfe Makefile: Use for the install of ascii art and default config 2016-02-08 22:02:49 +11:00
Dylan
9d35c8e6d1 Fix typo in usage and remove 1.1 changelog. Closes #51 2016-02-07 16:41:34 +11:00
Dylan
4fed7d5576 Change 'seperator' to 'separator'. Thanks @tudurom 2016-02-07 10:03:49 +11:00
Dylan
f82adabc11 Added usage for stdout mode 2016-02-06 10:49:06 +11:00
Dylan
ce3415481b Remove underline from stdout output 2016-02-06 10:30:46 +11:00
Dylan
e3fc21fd5f Merge master into stdout2 as we need some changes from master. 2016-02-06 10:27:16 +11:00
Dylan
0507b6a80e Remove uneeded check 2016-02-06 10:27:14 +11:00
Dylan
a80d50b0ff Added '--underline on/off' and '' to toggle it 2016-02-06 10:25:12 +11:00
Dylan
943a5493c3 Stdout mode: Replace the printinfo function instead of disabling it. 2016-02-06 10:21:12 +11:00
Dylan
6f69aed92e Fix '--stdout_seperator' not working when '--stdout' gets args 2016-02-06 10:04:50 +11:00
Dylan
84b8b04d83 Remove newline in if statement 2016-02-06 02:36:00 +11:00
Dylan
e6d8fc9c98 Remove unnecessary comments 2016-02-06 02:26:44 +11:00
Dylan
8da6f40ce0 Cleanup of stdout 2016-02-06 02:25:21 +11:00
Dylan
5e5cf5da2a Fix weird leftover escape codes in stdout mode 2016-02-06 01:31:13 +11:00
Dylan
59cc2f61ce Remove check for battery num 2016-02-06 01:27:17 +11:00
Dylan
4ad5cf791d Fix weird behaviour with prin and --stdout 2016-02-06 01:22:29 +11:00
Dylan
a69b86a22a Fix battery showing no info in stdout mode 2016-02-06 01:04:41 +11:00
Dylan
8e6a548f63 '--stdout' now takes arguments 2016-02-06 00:50:45 +11:00
Dylan
941c556012 Fixed doubled battery usage Windows 2016-02-05 22:08:32 +11:00
Dylan
008f73b3ab You can now print info without a subtitle! eg. "info memory" 2016-02-05 18:16:46 +11:00
Dylan
456c706f1d Fix missing title 2016-02-05 17:02:53 +11:00
Dylan
49e7673f0d Added '--stdout' to print the output in a lemonbar compatible format 2016-02-05 16:29:11 +11:00
Dylan
5aaab244ce Only re-enabled line wrap if we disabled it in the first place 2016-02-05 11:46:00 +11:00
Dylan
0667b18138 Only trap exit if images are enabled and fix trailing whitespace in getshell 2016-02-05 11:43:19 +11:00
Dylan
21815ecf4d Misc stuff 2016-02-05 00:07:20 +11:00
Dylan
015a0533bb Fix colors with custom ascii art 2016-02-04 21:22:58 +11:00
Dylan
4bb699a7f0 Added --size and $image_size to set the size in pixels. Text is still dynamically padded according to image size. 2016-02-04 18:42:54 +11:00
Dylan
ad25e2677f Really fix battery usage on Windows 2016-02-04 13:41:16 +11:00
Dylan
d8f9574be9 If 'ascii_colors' is empty, colors are disabled in ascii art 2016-02-04 12:53:56 +11:00
Dylan
d7d8600f1b You can now custom color all the colors in the distro and os ascii art! See 1.1.md 2016-02-04 12:50:50 +11:00
Dylan
4cd940052c Fix battery usage on Windows 2016-02-04 11:18:05 +11:00
Dylan
87bf157bf4 NVIDIA GPU: Fix double space before count 2016-02-03 21:36:29 +11:00
Dylan
a33f96cc02 Reformat usage to fit the value of each option 2016-02-03 19:15:42 +11:00
Dylan
5ca3666055 Fixes gpu count and added battery support to Mac OS X and Windows 2016-02-03 09:26:47 +11:00
Dylan
43cfab598c Quote array in for loop to avoid splitting 2016-02-02 14:13:09 +11:00
Dylan
439f4bd974 Misc changes 2016-02-02 14:11:20 +11:00
Dylan
6cd2881962 Added option to print each battery on the same line, check 1.1.md for more info 2016-02-02 12:01:50 +11:00
Dylan
bb48caec70 Added 'battery_num' which allows you to choose which battery to display by number. 2016-02-02 09:09:31 +11:00
Dylan
645a6a9ddb Linux: Added 'battery' which prints the usage percentage of each battery in your system 2016-02-02 01:56:33 +11:00
Dylan
047b5f30ef Remove '--colors' as I just found it that it's broken 2016-02-01 19:11:36 +11:00
Dylan
7609445b89 Added '--disable' to disable info from printing at launch, see 1.1.md for more info 2016-02-01 18:50:10 +11:00
Dylan
716fba3c79 Print '64-bit' on Windows and 'x86_64' on all other systems 2016-02-01 15:10:53 +11:00
Dylan
1a303e916f Swap to using getconf instead of integer overflow as it didn't work on Windows 2016-02-01 15:02:42 +11:00
Dylan
da7667202f wildcard distro suffixes 2016-02-01 14:56:53 +11:00
Dylan
d90d7259a9 Added option to show architecture for all OS types with '' 2016-02-01 14:45:53 +11:00
Dylan
07956cdabb Remove whitespace 2016-02-01 13:25:06 +11:00
Dylan
77562390ac misc changes to the order some things are run 2016-02-01 13:19:09 +11:00
Dylan
075c487064 Remove duplicate blocks inside of getcpu and getmemory 2016-02-01 11:44:03 +11:00
Dylan
f7107a8ffb Only get column count if we need it. 2016-02-01 11:05:46 +11:00
Dylan
4f068c4f4c Fix padding not working in some systems 2016-02-01 10:07:46 +11:00
Dylan
5729d33cb5 I actually fixed the double space before '@' in cpu usage! 2016-02-01 09:57:48 +11:00
Dylan
dd04093a3b If ascii file doesn't exist fallback to distro ascii, if the distro ascii doesn't exist fallback to no image mode. 2016-02-01 09:25:45 +11:00
Dylan
21c76cd90e Move some getimage blocks down so they only run in image mode 2016-02-01 08:53:00 +11:00
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