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

CHANGELOG.md

@@ -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.
 - Delete most of `info()` and instead call `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
 
@@ -100,3 +100,9 @@ Neofetch now has an irc channel at `#neofetch` on Freenode. If you have any ques
 ## Screenshot
 
 - Use arrays for `$scrot_program`
+
+
+## Args
+
+- Fixed bug where `neofetch --config` sourced the user config twice.
+- Cleaned up config arg handling.

neofetch

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