luisgulo/neofetch
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge branch 'master' of github.com:dylanaraps/neofetch

Browse source
This commit is contained in:
Dylan Araps 2016-12-16 14:57:51 +11:00
commit e23f6cdc0c
2 changed files with 16 additions and 21 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
CHANGELOG.md
View file

@ -26,7 +26,7 @@ Neofetch now has an irc channel at `#neofetch` on Freenode. If you have any ques
- A new flag was added called `--gen-man` which generates a neofetch manpage in your current directory. - A new flag was added called `--gen-man` which generates a neofetch manpage in your current directory.
- Delete most of `info()` and instead call `prin()`. - Delete most of `info()` and instead call `prin()`.
- This removes a lot of duplicate code between `info()` and `prin()`. - This removes a lot of duplicate code between `info()` and `prin()`.
- Remove `printf` subshells and instead use `printf -v` to declare the variables.
## Info ## Info
@ -100,3 +100,9 @@ Neofetch now has an irc channel at `#neofetch` on Freenode. If you have any ques
## Screenshot ## Screenshot
- Use arrays for `$scrot_program` - Use arrays for `$scrot_program`
## Args
- Fixed bug where `neofetch --config` sourced the user config twice.
- Cleaned up config arg handling.

29
neofetch
View file

@ -1798,7 +1798,7 @@ get_birthday() {
get_cols() { get_cols() {
if [[ "$color_blocks" == "on" ]]; then if [[ "$color_blocks" == "on" ]]; then
# Convert the width to space chars. # Convert the width to space chars.
block_width="$(printf "%${block_width}s")" printf -v block_width "%${block_width}s"
block_width="${block_width// /█}" block_width="${block_width// /█}"
# Generate the string. # Generate the string.
@ -1811,7 +1811,7 @@ get_cols() {
done done
# Convert height into spaces. # Convert height into spaces.
spaces="$(printf "%${block_height}s")" printf -v spaces "%${block_height}s"
# Convert the spaces into rows of blocks. # Convert the spaces into rows of blocks.
[[ "$blocks" ]] && cols+="${spaces// /${blocks}${reset}nl}" [[ "$blocks" ]] && cols+="${spaces// /${blocks}${reset}nl}"
@ -1850,7 +1850,7 @@ get_image_backend() {
*) *)
if [[ -d "$image_source" ]]; then if [[ -d "$image_source" ]]; then
files=("${image_source%/}"/*.{png,jpg,jpeg}) files=("${image_source%/}"/*.{png,jpg,jpeg})
image="$(printf "%s" "${files[RANDOM % (${#files[@]} - 1)]}")" printf -v image "%s" "${files[RANDOM % (${#files[@]} - 1)]}"
else else
image="$image_source" image="$image_source"
fi fi
@ -2418,7 +2418,7 @@ prin() {
get_underline() { get_underline() {
if [[ "$underline_enabled" == "on" ]]; then if [[ "$underline_enabled" == "on" ]]; then
underline="$(printf %"$length"s)" printf -v underline "%${length}s"
underline="${underline_color}${underline// /$underline_char}" underline="${underline_color}${underline// /$underline_char}"
unset -v length unset -v length
fi fi
@ -2704,8 +2704,7 @@ color() {
# OTHER # OTHER
err() { err() {
err+="$(color 1)[!]\033[0m $1 err+="$(color 1)[!]\033[0m $1\n"
"
} }
get_script_dir() { get_script_dir() {
@ -2792,8 +2791,8 @@ bar() {
elapsed="$(($1 * bar_length / $2))" elapsed="$(($1 * bar_length / $2))"
# Create the bar with spaces # Create the bar with spaces
prog="$(printf %"$elapsed"s)" printf -v prog "%${elapsed}s"
total="$(printf %"$((bar_length - elapsed))"s)" printf -v total "%$((bar_length - elapsed))s"
# Set the colors and swap the spaces for $bar_char_ # Set the colors and swap the spaces for $bar_char_
bar+="${bar_color_elapsed}${prog// /$bar_char_elapsed}" bar+="${bar_color_elapsed}${prog// /$bar_char_elapsed}"
@ -3134,17 +3133,7 @@ exit 1
get_args() { get_args() {
# Check the commandline flags early for '--config none/off' # Check the commandline flags early for '--config none/off'
case "$@" in [[ "$@" =~ --config\ ?(off|none) ]] || get_user_config 2>/dev/null
*"--config off"* | *'--config "off"'* | *"--config 'off'"* | \
*"--config none"* | *'--config "none"'* | *"--config 'none'"*)
config="off"
;;
*"--config -"*) ;;
*"--config"*) config="off" ;;
esac
[[ "${config:-on}" == "on" ]] && get_user_config 2>/dev/null
while [[ "$1" ]]; do while [[ "$1" ]]; do
case "$1" in case "$1" in
@ -3291,7 +3280,7 @@ get_args() {
# Other # Other
"--config") "--config")
case "$2" in case "$2" in
"none" | "off") config="off" ;; "none" | "off" | "") config="off" ;;
*) config_file="$2"; config="on"; get_user_config 2>/dev/null ;; *) config_file="$2"; config="on"; get_user_config 2>/dev/null ;;
esac esac
;; ;;