Compare commits

..

47 Commits
0.1 ... 0.2.1

Author SHA1 Message Date
dylan araps
25941af61b Readme 2016-01-04 16:00:19 +11:00
dylan araps
b0e9cc4782 Fixed whitespace issue and name issue with OS X uptime 2016-01-04 15:50:52 +11:00
dylan araps
62db9ad83a Uptime support for OS X 2016-01-04 15:30:14 +11:00
dylan araps
ebfe0dbc8c OS X: Uptime, take two 2016-01-04 15:09:47 +11:00
dylan araps
596952e0a2 Mac OS X: Added uptime (Needs to be tested) 2016-01-04 15:04:25 +11:00
dylan araps
4fc82847db Mac OS X: getmemory fix. 2016-01-04 14:59:47 +11:00
dylan araps
94cac0676f Fix package issue on Mac OS X 2016-01-04 14:38:38 +11:00
dylan araps
cfa089e801 Moved song to optional info, added getresolution to get screen res using xorg-xdpyinfo (disabled by default) and added uptime shorthand option to shorten the output of uptime 2016-01-04 14:31:21 +11:00
dylan araps
0e3fed419e Revert shebang to /usr/bin/env bash 2016-01-04 13:09:23 +11:00
dylan araps
4d0c127b9b Readme 2016-01-04 10:36:32 +11:00
dylan araps
656680b324 Update Readme 2016-01-04 10:34:12 +11:00
dylan araps
60e8f2a016 Fixed colon bug and fixed underline length 2016-01-04 10:33:45 +11:00
dylan araps
7d9ce8923e Added option --image_position to display the image on the left or right of the terminal 2016-01-04 10:20:36 +11:00
dylan araps
c034067573 The get* functions now fallback to 'Unknown' instead of printing nothing 2016-01-04 09:25:30 +11:00
dylan araps
cd4848e27c getos now gets os type (Linux, Mac OS X, OpenBSD) and the new function getdistro gets (Arch Linux, Ubuntu, etc). This way the case statements can always end in an Unknown instead of falling back to linux. 2016-01-04 09:21:13 +11:00
dylan araps
70af2fc12d Added more support for OpenBSD. I'm installing OpenBSD to test. 2016-01-04 08:48:50 +11:00
dylan araps
b645fd71c5 Added the start of OpenBSD support 2016-01-04 00:01:44 +11:00
dylan araps
572062d98b Fixes #8 2016-01-03 23:45:08 +11:00
dylan araps
ac3d1f6c6b Readme 2016-01-03 20:02:39 +11:00
dylan araps
5104e448e5 Update Readme 2016-01-03 19:59:15 +11:00
dylan araps
2120fbad0f Renamed blockwidth to block_width 2016-01-03 19:55:09 +11:00
dylan araps
5c2cee5b3b Finished rewrite and added OS X support (experimental), it's now way faster! 2016-01-03 17:54:16 +11:00
dylan araps
ef2ed6257a Update Readme 2016-01-01 16:49:11 +11:00
dylan araps
2c19725d41 Readme 2016-01-01 11:56:19 +11:00
dylan araps
d7277adfdb Remove stray sleep from test branch 2016-01-01 11:02:48 +11:00
dylan araps
ab7bffdfa4 Merge branch 'master' of https://github.com/dylanaraps/fetch.sh 2016-01-01 11:01:49 +11:00
dylan araps
3e375dd04e Left stray comment 2016-01-01 11:01:17 +11:00
dylan araps
b91a583ed1 Update readme 2016-01-01 11:00:43 +11:00
dylan araps
a8ebdf544d Update readme 2016-01-01 10:43:06 +11:00
dylan araps
6ad6283895 Fix linewrap option now working in screen/tmux 2016-01-01 10:41:31 +11:00
dylan araps
b7eff48b27 update Readme 2016-01-01 10:01:30 +11:00
dylan araps
9ace25a78c Save smart_crop_mode in the image filename, this way we can save one image for each mode 2016-01-01 09:45:39 +11:00
dylan araps
cfba9efae4 Fixed Readme images 2016-01-01 09:38:31 +11:00
dylan araps
1eede4fece Fixed Readme images 2016-01-01 09:37:50 +11:00
dylan araps
bc5478fa9f Fixed readme folds 2016-01-01 09:36:26 +11:00
dylan araps
8479a60c5b Oops 2016-01-01 09:34:43 +11:00
dylan araps
496a254db1 Merge branch 'master' of https://github.com/dylanaraps/fetch.sh 2016-01-01 09:33:16 +11:00
dylan araps
567ba97539 Added experimental smart crop feature 2016-01-01 09:33:08 +11:00
Dylan Araps
cb9a0b659b Merge pull request #4 from sapake/master
Add support for Void Linux
2016-01-01 09:01:35 +11:00
Sami Pitkänen
f45d3d6955 Add support for Void Linux 2015-12-31 19:35:49 +02:00
dylan araps
07538e0bf1 Cleanup Readme 2015-12-31 16:24:02 +11:00
dylan araps
1f58408293 Detect 'free' version, Add flags to customize underline, Change all negative flags to neutral ones 2015-12-31 15:43:13 +11:00
dylan araps
054504a8ab Detect 'free' version, Add flags to customize underline, Change all negative flags to neutral ones 2015-12-31 15:42:58 +11:00
dylan araps
5fbdfa35d6 cleanup 2015-12-31 13:19:30 +11:00
dylan araps
431644d61d Saner default for padding 2015-12-31 12:39:46 +11:00
dylan araps
e3780099f4 Add changes from #2, thanks @ix 2015-12-31 12:08:35 +11:00
dylan araps
f808a9c076 Readme 2015-12-31 11:37:31 +11:00
2 changed files with 874 additions and 469 deletions

138
Readme.md
View File

@@ -1,20 +1,18 @@
# fetch.sh # fetch.sh
### Check the releases page
https://github.com/dylanaraps/fetch.sh
## Big updates: Check the releases page.
This is the home of my fetch script! This script gathers info <br\> This is the home of my fetch script! This script gathers info <br\>
about your system and prints it to the terminal. about your system and prints it to the terminal.
I've spent the past few days rewriting this and it now supports <br\>
other distros as well as a ton of new features and bug fixes.
If you're having any issues or have any ideas, please open an issue! <br\> If you're having any issues or have any ideas, please open an issue! <br\>
I can't test on many other distros and I want this to work <br\> I can't test on many other distros and I want this to work <br\>
for as many people as possible. for as many people as possible.
![1](https://sr.ht/5aNV.png) ![1](https://sr.ht/Jd8Y.png)
<!-- {{{ -->
## Dependencies ## Dependencies
@@ -29,23 +27,27 @@ These are the script's optional dependencies:
- Image Cropping: ImageMagick - Image Cropping: ImageMagick
- Display Wallpaper: feh - Display Wallpaper: feh
- Current Song: mpc - Current Song: mpc
- Resolution Detection: xorg-xdpyinfo
<!-- }}} -->
<!-- {{{ -->
## Usage ## Usage
The script now supports dynamic image sizing and padding, The script now supports dynamic image sizing and padding,
<br\> they're enabled by default and there's a variable you <br\> it's enabled by default and there's a variable you
<br\> need to set for it to work correctly. <br\> need to set for it to work correctly.
You can either change the variable $fontwidth inside of the You can either change the variable $fontwidth inside of the
<br\> script or launch it with "--fontwidth num". <br\> script or launch it with ```--font_width num```.
Once you set the var the script will scale the image and padding Once you set the var the script will scale the image and padding
<br\> to fit your terminal window. <br\> to fit your terminal window.
You can disable this by changing the var "$img_auto" or by launching
<br\> the script with "--size px".
Please report any bugs or issues you're having with this as I can't Please report any bugs or issues you're having with this as I can't
<br\> test with many configurations. <br\> test with many configurations.
@@ -58,53 +60,61 @@ Info:
--distro string/cmd Manually set the distro --distro string/cmd Manually set the distro
--kernel string/cmd Manually set the kernel --kernel string/cmd Manually set the kernel
--uptime string/cmd Manually set the uptime --uptime string/cmd Manually set the uptime
--uptime_shorthand on/off --v
Shorten the output of uptime
--packages string/cmd Manually set the package count --packages string/cmd Manually set the package count
--shell string/cmd Manually set the shell --shell string/cmd Manually set the shell
--winman string/cmd Manually set the window manager --winman string/cmd Manually set the window manager
--cpu string/cmd Manually set the cpu name --cpu string/cmd Manually set the cpu name
--memory string/cmd Manually set the memory --memory string/cmd Manually set the memory
--speed string/cmd Manually set the cpu speed
--speed_type Change the type of cpu speed to get --speed_type Change the type of cpu speed to get
Possible values: current, min, max Possible values: current, min, max
--song string/cmd Manually set the current song --song string/cmd Manually set the current song
Text Colors: Text Colors:
--colors 1 2 3 4 Change the color of text --colors 1 2 3 4 5 Change the color of text
(title, subtitle, colon, info) (title, subtitle, colon, info)
--titlecol num Change the color of the title --title_color num Change the color of the title
--subtitlecol num Change the color of the subtitle --subtitle_color num Change the color of the subtitle
--coloncol num Change the color of the colons --colon_color num Change the color of the colons
--infocol num Change the color of the info --underline_color num Change the color of the underline
--info_color num Change the color of the info
Text Formatting: Text Formatting:
--nowrap Disable line wrapping --underline on/off Enable/Disable title underline
--nobold Disable bold text --underline_char char Character to use when underlineing title
--line_wrap on/off Enable/Disable line wrapping
--bold on/off Enable/Disable bold text
Color Blocks: Color Blocks:
--printcols start end Range of colors to print as blocks --color_blocks on/off Enable/Disable the color blocks
--blockwidth num Width of color blocks" --block_range start end --v
--nopal Disable the color blocks Range of colors to print as blocks
--block_width num Width of color blocks
Image: Image:
--image Image to display with the script --image Image to display with the script
The image gets priority over other The image gets priority over other
images: (wallpaper, \$img) images: (wallpaper, \$img)
--fontwidth Used to automatically size the image --font_width px Used to automatically size the image
--size px Change the size of the image --image_position Where to display the image: (Left/Right)
--cropoffset value Change the crop offset. Possible values: --split_size num Width of img/text splits
northwest, north, northeast, west, center A value of 2 makes each split half the terminal
east, southwest, south, southeast width and etc
--padding num How many spaces to pad the text --crop_mode Which crop mode to use
to the right Takes the values: normal, fit, fill
--crop_offset value Change the crop offset for crop_mode normal.
Possible values: northwest, north, northeast,
west, center, east, southwest, south, southeast
--xoffset px How close the image will be --xoffset px How close the image will be
to the left edge of the window to the left edge of the window
--yoffset px How close the image will be --yoffset px How close the image will be
to the top edge of the window to the top edge of the window
--gap num Gap between image and text right side --gap num Gap between image and text right side
--noimg Disable all images --images on/off Enable/Disable all images
--nowall Disable the wallpaper function --wall on/off Enable/Disable the wallpaper function
and fallback to \$img and fallback to \$img
--clean Remove all cropped images --clean Remove all cropped images
@@ -113,44 +123,52 @@ Other:
``` ```
<!-- }}} -->
<!-- {{{ -->
## TODO ## TODO
Here's what's on my todo list Here's what's on my todo list
- Add an easy way to define info prefixes at launch. - Uptime doesn't work in OS X yet.
- Finish adding an option to smart crop images with plain color backgrounds.
<br/>What this means is that your solid bg waifu wallpaper will be cropped around - Windows support (I'm almost done)
<br/>your waifu no matter where she is in the image.
- OpenBSD support (Partially implemented, just needs testing)
- Imagemagick optimizations
- Cleanup of info array handling
- More info outputs. Now that it's easy to customize what's printed and
everything is a function we can add optional support for pretty much anything.
- Resolution
- GTK themes
- Terminal Font
- GPU
- IP
- etc
<!-- }}} -->
## Customization ### Crop mode comparison
I launch fetch using a shell function and a ton of flags. Here's how it looks: #### Fit
![fit](https://imgur.com/MI0UtSV.png)
```sh #### Fill
fetch () { ![fill](https://imgur.com/LvxYwki.png)
fetch.sh \
--printcols 1 7 \
--cpu "AMD FX-6300" \
--uptime "$(uptime -p | sed -e 's/minutes/mins/')" \
--title "dylan's pc" \
--nowrap \
--nobold \
$@
}
```
Notice how you can even pass commands? This allows you to easily use custom
<br/> commands or even just bare strings to change the info.
## Screenshots ### Thanks
#### The color script is now builtin. Thanks to:
![2](https://sr.ht/Z9hZ.png)
#### You can now customize the color of everything. - Screenfetch: I've used some snippets as a base for a few functions in this script
![3](https://sr.ht/hy7m.png)
#### You can now disable all images with a flag. - @jrgz: Helping me test the Mac OS X version.
![4](https://sr.ht/zujR.png)

1205
fetch.sh

File diff suppressed because it is too large Load Diff