Merge pull request #226 from dylanaraps/error_msg

.github/ISSUE_TEMPLATE.md

@@ -6,6 +6,8 @@
 
 #### Operating system
 
+## Screenshot (If relevant)
+
 ## Verbose log
 
 **Neofetch 1.6**
@@ -16,7 +18,7 @@
 
 **Neofetch 1.7**
 
-2. Run `neofetch --verbose 2> neofetchlog`
+2. Run `neofetch -vv 2> neofetchlog`
 3. Upload the contents of `neofetchlog` to pastebin, gist or equivalent.
 
 

1.7.md

@@ -11,10 +11,19 @@ Thanks to the following people for contributing this release.
 ### General
 
 - Made it easier to get verbose logs.
-- Added `--verbose` to print a verbose log to stdout. \[1\]
 - Added issue template for github.
 
-\[1\] Use `neofetch --verbose 2> file` to save a verbose log for bug reporting.
+### Error Messages
+
+Neofetch now supports displaying error messages and saving a verbose log for<br \>
+troubleshooting.
+
+![log](https://ipfs.pics/ipfs/QmeTWGKozY79zcxbrgXueyTRfQcTUe7ZmDqLv4ASgJB4G4)
+
+- Added `-v` to print error messages to stdout.
+- Added `-vv` to print a verbose log to stdout. \[1\]
+
+\[1\] Use `neofetch -vv 2> file` to save a verbose log for bug reporting.
 
 ### Info
 

neofetch

@@ -1890,6 +1890,9 @@ getwallpaper () {
 
     # If img is an xml file don't use it.
     [ "${img/*\./}" == "xml" ] && img=""
+
+    # Error msg
+    [ -z "$img" ] && err "Wallpaper detection failed, falling back to ascii mode."
 }
 
 # }}}
@@ -1898,6 +1901,10 @@ getwallpaper () {
 
 getascii () {
     if [ ! -f "$ascii" ] || [ "$ascii" == "distro" ]; then
+        # Error message
+        [ "$ascii" != "distro" ] && \
+        [ ! -f "$ascii" ] && err "Ascii file not found, using distro ascii"
+
         # Lowercase the distro name
         if [ "$version" -le 3 ]; then
             ascii=$(tr '[:upper:]' '[:lower:]' <<< "$ascii_distro")
@@ -1921,6 +1928,7 @@ getascii () {
             if [ ! -f "$script_dir/ascii/distro/${ascii/ *}" ]; then
                 padding="\033[0C"
                 image="off"
+                err "Ascii file not found, falling back to text mode."
                 return
             fi
 
@@ -2008,6 +2016,11 @@ getimage () {
     if [ ! -f "$img" ] || [ ${#term_size} -le 5 ]; then
         image="ascii"
         getascii
+
+        # Error messages
+        [ ! -f "$img" ] && err "\$img, isn't a file, falling back to ascii mode."
+        [ ${#term_size} -le 5 ] && err "Your terminal doesn't support \\\033[14t, falling back to ascii mode."
+
         return
     fi
 
@@ -2141,6 +2154,7 @@ getw3m_img_path () {
 
     else
         image="ascii"
+        err "w3m-img wasn't found on your system, falling back to ascii mode."
     fi
 }
 
@@ -2582,6 +2596,9 @@ kdeconfigdir () {
 
 # }}}
 
+err () {
+    err+="$(color 1)[!]$(color fg) $1 \n"
+}
 
 # }}}
 
@@ -2891,7 +2908,8 @@ while [ "$1" ]; do
             }
         ;;
 
-        --verbose) set -x ;;
+        -v) verbose="on" ;;
+        -vv) set -x; verbose="on" ;;
         --help) usage ;;
     esac
 
@@ -2983,4 +3001,9 @@ if [ "$scrot" == "on" ]; then
     takescrot
 fi
 
+# Show error messages
+if [ "$verbose" == "on" ]; then
+    printf "$err"
+fi
+
 # }}}