Output refactor 2

.github/tests/macos.sh

@@ -12,11 +12,11 @@ errorOut () {
 
 bash_exe="/usr/local/bin/bash"
 
-if [[ $(bash fetch --config sample.config.conf -v) ]]; then
+if [[ $(bash fetch --config sample.config.conf --lib . -v) ]]; then
     successOut 'Fetched current output:'
-    ${bash_exe} fetch --config sample.config.conf -v
+    ${bash_exe} fetch --config sample.config.conf --lib . -v
 else
     errorOut 'fetch failed output:'
-    ${bash_exe} fetch --config sample.config.conf -v
+    ${bash_exe} fetch --config sample.config.conf --lib . -v
     exit 1
-fi
+fi

.github/tests/ubuntu.sh

@@ -12,24 +12,21 @@ errorOut () {
 }
 
 
-if [[ $(bash fetch --config sample.config.conf -v -C .) ]]; then
+if [[ $(bash fetch --lib . --config sample.config.conf -v) ]]; then
     successOut 'Fetched current output:'
-    bash fetch --config sample.config.conf -C . -v
+    bash fetch --lib . --config sample.config.conf -v
 else
     errorOut 'fetch failed output:'
-    bash fetch --config sample.config.conf -C . -v
+    bash fetch --lib . --config sample.config.conf -v
     exit 1
 fi
 
-# shellcheck disable=SC1094
-source ./ascii/ubuntu.sh
-
 n=0
 IFS=$'\n'
 while read -r line; do
     _output[${n}]="${line}"
     ((n++))
-done <<< "$(bash fetch --config sample.config.conf -v -C .)"
+done <<< "$(bash fetch --lib . --config sample.config.conf -v)"
 
 if [[ ! ${_output[0]} =~ ^(.*)'Finding kernel...found as'(.*)'Linux '[[:digit:]]+'.'[[:digit:]]+'.'[[:digit:]]+'-'[[:digit:]]+'-azure' ]]; then
     errorOut "!! Failed on kernel."

.github/tests/windows.sh

@@ -10,21 +10,11 @@ errorOut () {
     printf '%b\n' "${error}${1}${reset}"
 }
 
-if [[ $(type -p dos2unix) ]]; then 
-    $(which dos2unix) fetch
-    $(which dos2unix) lib/Windows/ascii.sh
-else
-    sed 's/\r$//' < fetch | od -c > fetch2.sh
-    mv fetch2.sh fetch
-    sed 's/\r$//' < lib/Windows/ascii.sh | od -c > lib/Windows/ascii2.sh
-    mv lib/Windows/ascii2.sh lib/Windows/ascii.sh
-fi
-
-if [[ $(bash fetch --config sample.config.conf -v) ]]; then
+if [[ $(bash fetch --config sample.config.conf --lib . -v) ]]; then
     successOut 'Fetched current output:'
-    bash fetch --config sample.config.conf -v
+    bash fetch --config sample.config.conf --lib . -v
 else
     errorOut 'fetch failed output:'
-    bash fetch --config sample.config.conf -v
+    bash fetch --config sample.config.conf --lib . -v
     exit 1
-fi
+fi

.github/workflows/release.yaml

@@ -21,11 +21,12 @@ jobs:
       - name: Create package structure
         run: |
           mkdir -p deb_pkg/usr/share/fetch
+          mldor -p deb_pkg/usr/share/man/man.1
           mkdir -p deb_pkg/usr/local/bin
           cp -r ascii lib deb_pkg/usr/share/fetch/
-          cp LICENSE README.md deb_pkg/usr/share/fetch/
-          cp sample.config.conf deb_pkg/usr/share/fetch/config.conf
+          cp LICENSE README.md sample.config.conf deb_pkg/usr/share/fetch/
           cp fetch deb_pkg/usr/local/bin/
+          cp fetch.1 deb_pkg/usr/share/man/man.1/
       - name: Build some variables to use
         run: |
           PVERSION=${{ env.CI_REF_NAME }}
@@ -63,10 +64,11 @@ jobs:
         run: |
           mkdir -p rpm_pkg/usr/share/fetch
           mkdir -p rpm_pkg/usr/local/bin
+          mkdir -p rpm_pkg/usr/share/man/man.1
           cp -r ascii lib rpm_pkg/usr/share/fetch/
-          cp LICENSE README.md rpm_pkg/usr/share/fetch/
-          cp sample.config.conf rpm_pkg/usr/share/fetch/config.conf
+          cp LICENSE README.md sample.config.conf rpm_pkg/usr/share/fetch/
           cp fetch rpm_pkg/usr/local/bin/
+          cp fetch.1 /usr/share/man/man.1/
       - name: Build some variables to use
         run: |
           PVERSION=${{ env.CI_REF_NAME }}

README.md

@@ -18,6 +18,7 @@ Over the past several years, I've received a couple of pretty repeatable complai
   - Totally unstandardeized use of brackets, quotes, braces, you name it. As mentioned, screenFetch was first started in 2009, when I was a senior in high school. I knew very little about BASH aside from small shell scripts and just using it as my shell. I continued to grow and maintain it over the next 10 years learning much along the way. However, I almost never revisited older sections of the script, resulting in totally different coding styles and inefficient information gathering in the older sections. fetch aims to solve that by hopefully keeping an easy to use coding standard throughout.
   - Monolithic, 15k line BASH script. While this was done to keep one of screenFetch's original core functionalities in place (the ability to `wget` the raw file, `chmod +x` to it, and run it as a one-liner), it has become a bear of a script to maintain, work on, and read. fetch aims to fix some of that, while breaking the aforementioned functionality, by splitting ASCII art and distribution/OS specific code into mostly separate, sourceable lib files. This will keep fetch very packageable and only as big as it needs to be to get all the information about your running system.
   - No persistent configuration / have to run every single time with tons of flags if you wanna do off the wall stuff. screenFetch had a couple of nice, interesting flags to alter the output of the script. However, if you wanted to do several modifications to the output, you had to either 1) alias the one-liner to something shorter or 2) remember all those flags and values every time you wanted to run it. fetch solves that by implementing a configuration file that is well commented and easy to follow. As fetch grows and I work in most of the screenFetch functionality, that configuration will grow to include many more configurable things. You should not have to do any major, huge editing to the configuration logic to include new functions and configuration sections, either.
+
 ## License
 Components pulled from [screenFetch](https://github.com/KittyKatt/screenFetch) that were pulled in by external contributors are licensed under the GPLv3+ license. You can find this license at [LICENSE.gpl](LICENSE.gpl).