Merge pull request #110 from dylanaraps/neofetch
Rename fetch to neofetch
This commit is contained in:
Dylan Araps
commit
8f79a13206
4
1.4.md
4
1.4.md
|
|
@ -1,4 +1,6 @@
|
|||
# Fetch 1.4
|
||||
# Neofetch 1.4
|
||||
|
||||
- Renamed `fetch` to `neofetch`. Thanks for voting.
|
||||
|
||||
### Info
|
||||
|
||||
|
|
|
|||
14
Makefile
14
Makefile
|
|
@ -5,17 +5,17 @@ INSTALL_PROG ?= install -m755
|
|||
INSTALL_FILE ?= install -m644
|
||||
|
||||
all:
|
||||
@echo Run \'make install\' to install Fetch
|
||||
@echo Run \'make install\' to install Neofetch
|
||||
|
||||
install:
|
||||
$(INSTALL_DIR) $(DESTDIR)$(PREFIX)/bin
|
||||
$(INSTALL_DIR) $(DESTDIR)$(PREFIX)/share/fetch/ascii/distro
|
||||
$(INSTALL_PROG) fetch $(DESTDIR)$(PREFIX)/bin/fetch
|
||||
$(INSTALL_PROG) config/config $(DESTDIR)$(PREFIX)/share/fetch/config
|
||||
$(INSTALL_PROG) ascii/distro/* $(DESTDIR)$(PREFIX)/share/fetch/ascii/distro
|
||||
$(INSTALL_DIR) $(DESTDIR)$(PREFIX)/share/neofetch/ascii/distro
|
||||
$(INSTALL_PROG) neofetch $(DESTDIR)$(PREFIX)/bin/neofetch
|
||||
$(INSTALL_PROG) config/config $(DESTDIR)$(PREFIX)/share/neofetch/config
|
||||
$(INSTALL_PROG) ascii/distro/* $(DESTDIR)$(PREFIX)/share/neofetch/ascii/distro
|
||||
|
||||
uninstall:
|
||||
$(RM) $(DESTDIR)$(PREFIX)/bin/fetch
|
||||
$(RM) -r $(DESTDIR)$(PREFIX)/share/fetch
|
||||
$(RM) $(DESTDIR)$(PREFIX)/bin/neofetch
|
||||
$(RM) -r $(DESTDIR)$(PREFIX)/share/neofetch
|
||||
|
||||
|
||||
|
|
|
|||
24
README.md
24
README.md
|
|
@ -1,4 +1,4 @@
|
|||
# fetch
|
||||
# Neofetch
|
||||
|
||||
[](https://gitter.im/dylanaraps/fetch?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge)
|
||||
|
||||
|
|
@ -52,7 +52,7 @@ your distro's logo or any ascii art of your choice!
|
|||
- The script is **fast**. We use bash builtins wherever possible and only spawn external processes when necessary.
|
||||
- Take a screenshot of your desktop on script finish.
|
||||
- Customize **which** info is displayed, **where** it's displayed and **when** it's displayed.
|
||||
- See this **[wiki page](https://github.com/dylanaraps/fetch/wiki/Customizing-Info)**
|
||||
- See this **[wiki page](https://github.com/dylanaraps/neofetch/wiki/Customizing-Info)**
|
||||
|
||||
|
||||
<!-- }}} -->
|
||||
|
|
@ -84,7 +84,7 @@ your distro's logo or any ascii art of your choice!
|
|||
- Screenshot: `scrot` \[5\]
|
||||
|
||||
|
||||
\[1\] See **[#79](https://github.com/dylanaraps/fetch/issues/79)** about why this is now a required dependency.
|
||||
\[1\] See **[#79](https://github.com/dylanaraps/neofetch/issues/79)** about why this is now a required dependency.
|
||||
|
||||
\[2\] `w3m-img` is sometimes bundled together with `w3m`.
|
||||
|
||||
|
|
@ -95,7 +95,7 @@ terminal emulators that don't support the xterm escape sequences we're using for
|
|||
changing the config option `$image_backend` to `iterm2`.
|
||||
|
||||
\[5\] You can use the launch flag `--scrot_cmd` or change the config option `$scrot_cmd` to your screenshot<br \>
|
||||
program's cmd and fetch will use it instead of scrot.
|
||||
program's cmd and neofetch will use it instead of scrot.
|
||||
|
||||
|
||||
<!-- }}} -->
|
||||
|
|
@ -106,15 +106,15 @@ program's cmd and fetch will use it instead of scrot.
|
|||
|
||||
## Installation
|
||||
|
||||
Those using a git version of fetch should check this page after<br \>
|
||||
Those using a git version of neofetch should check this page after<br \>
|
||||
updating, this page lists any breaking changes that were made and<br \>
|
||||
how you can workaround them.
|
||||
|
||||
https://github.com/dylanaraps/fetch/wiki/Following-HEAD
|
||||
https://github.com/dylanaraps/neofetch/wiki/Following-HEAD
|
||||
|
||||
### Arch
|
||||
|
||||
1. Install **[fetch-git](https://aur.archlinux.org/packages/fetch-git/)** from the aur.
|
||||
1. Install **[neofetch-git](https://aur.archlinux.org/packages/neofetch-git/)** from the aur.
|
||||
|
||||
|
||||
### Gentoo / Funtoo
|
||||
|
|
@ -143,13 +143,13 @@ https://github.com/dylanaraps/fetch/wiki/Following-HEAD
|
|||
|
||||
### Others
|
||||
|
||||
1. Download the latest source at https://github.com/dylanaraps/fetch
|
||||
1. Download the latest source at https://github.com/dylanaraps/neofetch
|
||||
2. Run `make install` inside the script directory to install the script.
|
||||
- **El Capitan**: `PREFIX=/usr/local make install`
|
||||
|
||||
**NOTE:** Fetch can be uninstalled easily using `make uninstall`.
|
||||
**NOTE:** Neofetch can be uninstalled easily using `make uninstall`.
|
||||
|
||||
**NOTE:** Fetch can also be run from any directory like a normal script,<br \>
|
||||
**NOTE:** Neofetch can also be run from any directory like a normal script,<br \>
|
||||
you'll just be missing the ascii distro logos and automatic config file creation.
|
||||
|
||||
|
||||
|
|
@ -164,7 +164,7 @@ you'll just be missing the ascii distro logos and automatic config file creation
|
|||
|
||||
#### Using the config file
|
||||
|
||||
Fetch will by default create a config file at `$HOME/.config/fetch/config` and this file<br \>
|
||||
Neofetch will by default create a config file at `$HOME/.config/neofetch/config` and this file<br \>
|
||||
contains all of the script's options/settings. The config file allows you to keep your<br \>
|
||||
customizations between script versions and allows you to easily share your customizations<br \>
|
||||
with other people.
|
||||
|
|
@ -341,7 +341,7 @@ used automatically
|
|||
|
||||
|
||||
|
||||
#### Why doesn't fetch support my wallpaper setter?
|
||||
#### Why doesn't Neofetch support my wallpaper setter?
|
||||
|
||||
It's hard to add support for other wallpaper setters as they don't provide a way of <br \>
|
||||
getting the current wallpaper from the cli.
|
||||
|
|
|
|||
|
|
@ -1,8 +1,8 @@
|
|||
#!/usr/bin/env bash
|
||||
# vim: fdm=marker:noai:ts=4:sw=4
|
||||
#
|
||||
# Fetch info about your system
|
||||
# https://github.com/dylanaraps/fetch
|
||||
# Neofetch info about your system
|
||||
# https://github.com/dylanaraps/neofetch
|
||||
#
|
||||
# Required Dependencies:
|
||||
# Bash 4.0+
|
||||
|
|
@ -34,7 +34,7 @@ export LANG=C
|
|||
|
||||
# Info
|
||||
# See this wiki page for more info:
|
||||
# https://github.com/dylanaraps/fetch/wiki/Customizing-Info
|
||||
# https://github.com/dylanaraps/neofetch/wiki/Customizing-Info
|
||||
printinfo () {
|
||||
info title
|
||||
info underline
|
||||
|
|
@ -245,7 +245,7 @@ prompt_height=1
|
|||
image="wall"
|
||||
|
||||
# Thumbnail directory
|
||||
thumbnail_dir="$HOME/.cache/thumbnails/fetch"
|
||||
thumbnail_dir="$HOME/.cache/thumbnails/neofetch"
|
||||
|
||||
# Image Backend
|
||||
# Which program to draw images with
|
||||
|
|
@ -332,7 +332,7 @@ scrot_dir="$HOME/Pictures"
|
|||
# Scrot filename
|
||||
# What to name the screenshots
|
||||
# --scrot_name str
|
||||
scrot_name="fetch-%Y-%m-%d-%H:%M.png"
|
||||
scrot_name="neofetch-%Y-%m-%d-%H:%M.png"
|
||||
|
||||
|
||||
# }}}
|
||||
|
|
@ -346,7 +346,7 @@ config="on"
|
|||
|
||||
# Path to custom config file location
|
||||
# --config path/to/config
|
||||
config_file="$HOME/.config/fetch/config"
|
||||
config_file="$HOME/.config/neofetch/config"
|
||||
|
||||
|
||||
# }}}
|
||||
|
|
@ -1629,11 +1629,11 @@ getascii () {
|
|||
ascii=${ascii_distro,,}
|
||||
fi
|
||||
|
||||
if [ -f "/usr/share/fetch/ascii/distro/${ascii/ *}" ]; then
|
||||
ascii="/usr/share/fetch/ascii/distro/${ascii/ *}"
|
||||
if [ -f "/usr/share/neofetch/ascii/distro/${ascii/ *}" ]; then
|
||||
ascii="/usr/share/neofetch/ascii/distro/${ascii/ *}"
|
||||
|
||||
elif [ -f "/usr/local/share/fetch/ascii/distro/${ascii/ *}" ]; then
|
||||
ascii="/usr/local/share/fetch/ascii/distro/${ascii/ *}"
|
||||
elif [ -f "/usr/local/share/neofetch/ascii/distro/${ascii/ *}" ]; then
|
||||
ascii="/usr/local/share/neofetch/ascii/distro/${ascii/ *}"
|
||||
|
||||
else
|
||||
getscriptdir
|
||||
|
|
@ -2185,24 +2185,24 @@ getconfig () {
|
|||
return
|
||||
fi
|
||||
|
||||
# Check $HOME/.config/fetch and create the
|
||||
# Check $HOME/.config/neofetch and create the
|
||||
# dir/files if they don't exist.
|
||||
if [ -f "$HOME/.config/fetch/config" ]; then
|
||||
source "$HOME/.config/fetch/config"
|
||||
if [ -f "$HOME/.config/neofetch/config" ]; then
|
||||
source "$HOME/.config/neofetch/config"
|
||||
|
||||
elif [ -f "/usr/share/fetch/config" ]; then
|
||||
cp "/usr/share/fetch/config" "$HOME/.config/fetch"
|
||||
source "$HOME/.config/fetch/config"
|
||||
elif [ -f "/usr/share/neofetch/config" ]; then
|
||||
cp "/usr/share/neofetch/config" "$HOME/.config/neofetch"
|
||||
source "$HOME/.config/neofetch/config"
|
||||
|
||||
elif [ -f "/usr/local/share/fetch/config" ]; then
|
||||
cp "/usr/local/share/fetch/config" "$HOME/.config/fetch"
|
||||
source "$HOME/.config/fetch/config"
|
||||
elif [ -f "/usr/local/share/neofetch/config" ]; then
|
||||
cp "/usr/local/share/neofetch/config" "$HOME/.config/neofetch"
|
||||
source "$HOME/.config/neofetch/config"
|
||||
|
||||
else
|
||||
getscriptdir
|
||||
|
||||
cp "$script_dir/config/config" "$HOME/.config/fetch"
|
||||
source "$HOME/.config/fetch/config"
|
||||
cp "$script_dir/config/config" "$HOME/.config/neofetch"
|
||||
source "$HOME/.config/neofetch/config"
|
||||
fi
|
||||
}
|
||||
|
||||
|
|
@ -2225,7 +2225,7 @@ esac
|
|||
|
||||
usage () { cat << EOF
|
||||
|
||||
usage: fetch --option "value" --option "value"
|
||||
usage: neofetch --option "value" --option "value"
|
||||
|
||||
NOTE: There's also a config option for each flag below.
|
||||
|
||||
|
|
@ -2233,7 +2233,7 @@ usage () { cat << EOF
|
|||
--disable infoname Allows you to disable an info line from appearing
|
||||
in the output.
|
||||
NOTE: You can supply multiple args. eg.
|
||||
'fetch --disable cpu gpu disk shell'
|
||||
'neofetch --disable cpu gpu disk shell'
|
||||
--osx_buildversion on/off Hide/Show Mac OS X build version.
|
||||
--os_arch on/off Hide/Show Windows architecture.
|
||||
--speed_type type Change the type of cpu speed to display.
|
||||
|
|
@ -2305,7 +2305,7 @@ usage () { cat << EOF
|
|||
|
||||
|
||||
Stdout:
|
||||
--stdout info info Launch fetch in stdout mode which prints the info
|
||||
--stdout info info Launch neofetch in stdout mode which prints the info
|
||||
in a plain-text format that you can use with
|
||||
lemonbar etc.
|
||||
|
||||
|
|
@ -2464,7 +2464,7 @@ done
|
|||
trap 'printf "\033[?25h"; clear; exit' 2
|
||||
|
||||
if [ "$config" == "on" ]; then
|
||||
mkdir -p "$HOME/.config/fetch/"
|
||||
mkdir -p "$HOME/.config/neofetch/"
|
||||
getconfig
|
||||
fi
|
||||
|
||||
Reference in New Issue