Added missing dependency warning

Added new ascii art for more linux distros

.gitignore

@@ -1,2 +1,4 @@
 .idea
-build
+build
+stormfetch
+stormfetch.tar.gz

Makefile

@@ -7,10 +7,13 @@ endif
 ifeq ($(SYSCONFDIR),)
     SYSCONFDIR := $(PREFIX)/etc
 endif
+ifeq ($(GO),)
+    GO := /usr/bin/go
+endif
 
 build:
 	mkdir -p build
-	go build -o build/stormfetch stormfetch
+	$(GO) build -o build/stormfetch stormfetch
 
 install: build/stormfetch config/
 	mkdir -p $(DESTDIR)$(BINDIR)
@@ -18,5 +21,13 @@ install: build/stormfetch config/
 	cp build/stormfetch $(DESTDIR)$(BINDIR)/stormfetch
 	cp -r config/. $(DESTDIR)$(SYSCONFDIR)/stormfetch/
 
+compress: build/stormfetch config/
+	mkdir -p stormfetch/$(BINDIR)
+	mkdir -p stormfetch/$(SYSCONFDIR)/stormfetch/
+	cp build/stormfetch stormfetch/$(BINDIR)/stormfetch
+	cp -r config/. stormfetch/$(SYSCONFDIR)/stormfetch/
+	tar --owner=root --group=root -czf stormfetch.tar.gz stormfetch
+	rm -r stormfetch
+
 clean:
 	rm -r build/

README.md

@@ -12,6 +12,8 @@ Stormfetch is still in beta and distro compatibility is limited. If you would li
 ### Installation Guide
 - Download `go` from your package manager or from the go website
 - Download `make` from your package manager
+- (Optional) Download `xorg-xhost` from your package manager to display DE/WM and monitor information
+- (Optional) Download `xorg-xdpyinfo` from your package manager to display Screen Resolution
 - (Optional) Download `lshw` from your package manager to display GPU information
 - Run the following command to compile the project
 ```

config/ascii/opensuse

@@ -0,0 +1,18 @@
+           .;ldkO0000Okdl;.
+       .;d00xl:^''''''^:ok00d;.
+     .d00l'                'o00d.
+   .d0Kd'  Okxol:;,.          :O0d.
+  .OKKKK0kOKKKKKKKKKKOxo:,      lKO.
+ ,0KKKKKKKKKKKKKKKK0P^,,,^dx:    ;00,
+.OKKKKKKKKKKKKKKKKk'.oOPPb.'0k.   cKO.
+:KKKKKKKKKKKKKKKKK: kKx..dd lKd   'OK:
+dKKKKKKKKKKKOx0KKKd ^0KKKO' kKKc   dKd
+dKKKKKKKKKKKK;.;oOKx,..^..;kKKK0.  dKd
+:KKKKKKKKKKKK0o;...^cdxxOK0O/^^'  .0K:
+ kKKKKKKKKKKKKKKK0x;,,......,;od  lKk
+ '0KKKKKKKKKKKKKKKKKKKKK00KKOo^  c00'
+  'kKKKOxddxkOO00000Okxoc;''   .dKk'
+    l0Ko.                    .c00l'
+     'l0Kk:.              .;xK0l'
+        'lkK0xl:;,,,,;:ldO0kl'
+            '^:ldxkkkkxdl:^'

config/ascii/opensuse-tumbleweed

@@ -0,0 +1,13 @@
+                                     ......
+     .,cdxxxoc,.               .:kKMMMNWMMMNk:.
+    cKMMN0OOOKWMMXo. ;        ;0MWk:.      .:OMMk.
+  ;WMK;.       .lKMMNM,     :NMK,             .OMW;
+ cMW;            'WMMMN   ,XMK,                 oMM'
+.MMc               ..;l. xMN:                    KM0
+'MM.                   'NMO                      oMM
+.MM,                 .kMMl                       xMN
+ KM0               .kMM0. .dl:,..               .WMd
+ .XM0.           ,OMMK,    OMMMK.              .XMK
+   oWMO:.    .;xNMMk,       NNNMKl.          .xWMx
+     :ONMMNXMMMKx;          .  ,xNMWKkxllox0NMWk,
+         .....                    .:dOOXXKOxl,

config/ascii/tide

@@ -0,0 +1,17 @@
+                 @@@@@@@@@
+              @@@~~~~~~~~~@@
+            @@~~~         ~~@
+           @~~              @
+          @~          @@@  @
+        @@~          @   @@
+      @@~~           @
+   @@@~~             ~@@           @@@
+   ~~~                ~~@@@    @@@@~~~
+                        ~~~@@@@~~~~
+   @@@@          @@@@@@@   ~~~~   @@@@
+   ~~~~@@@@    @@~~~~~~~@@    @@@@
+       ~~~~@@@@~~       ~~@@@@~~~~
+    @@@    ~~~~   @@@@@   ~~~~    @@@
+    ~~~@@@@   @@@@~~~~~@@@@   @@@@~~~
+       ~~~~@@@~~~~     ~~~~@@@~~~
+           ~~~             ~~~

config/ascii/ubuntu

@@ -0,0 +1,20 @@
+            .-/+oossssoo+\-.
+        ´:+ssssssssssssssssss+:`
+      -+ssssssssssssssssssyyssss+-
+    .ossssssssssssssssssdMMMNysssso.
+   /ssssssssssshdmmNNmmyNMMMMhssssss\
+  +ssssssssshmydMMMMMMMNddddyssssssss+
+ /sssssssshNMMMyhhyyyyhmNMMMNhssssssss\
+.ssssssssdMMMNhsssssssssshNMMMdssssssss.
++sssshhhyNMMNyssssssssssssyNMMMysssssss+
+ossyNMMMNyMMhsssssssssssssshmmmhssssssso
+ossyNMMMNyMMhsssssssssssssshmmmhssssssso
++sssshhhyNMMNyssssssssssssyNMMMysssssss+
+.ssssssssdMMMNhsssssssssshNMMMdssssssss.
+ \sssssssshNMMMyhhyyyyhdNMMMNhssssssss/
+  +sssssssssdmydMMMMMMMMddddyssssssss+
+   \ssssssssssshdmNNNNmyNMMMMhssssss/
+    .ossssssssssssssssssdMMMNysssso.
+      -+sssssssssssssssssyyyssss+-
+        `:+ssssssssssssssssss+:`
+            .-\+oossssoo+/-.

config/config.yaml

@@ -1,2 +1,3 @@
 distro_ascii: auto
 fetch_script: auto
+dependency_warning: true

config/fetch_script.sh

@@ -11,7 +11,11 @@ if command_exists lshw; then
 fi
 echo "Memory: $(get_used_mem) MiB / $(get_total_mem) MiB"
 if xhost >& /dev/null ; then
-  echo "DE/WM: $(get_de_wm)"
+  if get_de_wm &> /dev/null; then
-  echo "Screen Resolution: $(get_screen_resolution)"
+    echo "DE/WM: $(get_de_wm)"
+  fi
+  if command_exists xdpyinfo ; then
+    echo "Screen Resolution: $(get_screen_resolution)"
+  fi
 fi
 

config/fetch_script_functions.sh

@@ -23,10 +23,10 @@ get_shell() {
     *)
         SHELL_NAME=${SHELL##*/}
         SHELL_VERSION="$($SHELL --version)"
-        SHELL_VERSION=$(SHELL_VERSION//,//)
+        SHELL_VERSION=${SHELL_VERSION//","}
-        SHELL_VERSION=$(SHELL_VERSION// //)
+        SHELL_VERSION=${SHELL_VERSION//" "}
-        SHELL_VERSION=$(SHELL_VERSION//VERSION//)
+        SHELL_VERSION=${SHELL_VERSION//"version"}
-        SHELL_VERSION=$(SHELL_VERSION//"$SHELL_NAME"//)
+        SHELL_VERSION=${SHELL_VERSION//"$SHELL_NAME"}
         echo "$SHELL_NAME $SHELL_VERSION"
         unset SHELL_NAME
         unset SHELL_VERSION
@@ -51,16 +51,32 @@ get_used_mem() {
 }
 
 get_de_wm() {
-    if [[ $DESKTOP_SESSION == "plasma" ]]; then
+    if ps -e | grep "plasmashell" &> /dev/null ; then
-      echo "KDE Plasma $(plasmashell --version | sed 's/plasmashell //g')"
+        echo "KDE Plasma $(plasmashell --version | awk '{print $2}')"
+    elif ps -e | grep "gnome-session" &> /dev/null ; then
+        echo "Gnome $(gnome-shell --version | awk '{print $3}')"
+    elif ps -e | grep "xfce4-session" &> /dev/null ; then
+        echo "XFCE $(xfce4-session --version | grep xfce4-session | awk '{print $2}')"
+    elif ps -e | grep "cinnamon" &> /dev/null ; then
+        echo "Cinnamon $(cinnamon --version | awk '{print $2}')"
+    elif ps -e | grep "mate-panel" &> /dev/null ; then
+        echo "Mate $(mate-about --version | awk '{print $4}')"
+    elif ps -e | grep "lxsession" &> /dev/null ; then
+        echo "LXDE"
+    elif ps -e | grep "sway" &> /dev/null ; then
+        echo "Sway $(sway --version | awk '{print $2}')"
+    elif ps -e | grep "icewm-session" &> /dev/null ; then
+        echo "IceWM $(icewm --version | awk '{print $2}' | sed 's/,//g')"
+    elif [ ! -z $DESKTOP_SESSION ]; then
+        echo "$DESKTOP_SESSION"
     else
-      echo "$DESKTOP_SESSION"
+        return 1
     fi
 }
 
 get_screen_resolution() {
-    if xhost >& /dev/null ;then
+    if xhost >& /dev/null && command_exists xdpyinfo; then
-      xdpyinfo | grep dimensions | tr -s ' ' | cut -d " " -f3
+        xdpyinfo | grep dimensions | tr -s ' ' | cut -d " " -f3
     fi
 }
 

main.go

@@ -16,8 +16,9 @@ var fetchScriptPath = ""
 var config = StormfetchConfig{}
 
 type StormfetchConfig struct {
-	Ascii       string `yaml:"distro_ascii"`
+	Ascii             string `yaml:"distro_ascii"`
-	FetchScript string `yaml:"fetch_script"`
+	FetchScript       string `yaml:"fetch_script"`
+	DependencyWarning bool   `yaml:"dependency_warning"`
 }
 
 type DistroInfo struct {
@@ -67,6 +68,23 @@ func readConfig() {
 	} else {
 		log.Fatalf("Fetch script file not found: %s", err.Error())
 	}
+	// Show Dependency warning if enabled
+	if config.DependencyWarning {
+		dependencies := []string{"lshw", "xhost", "xdpyinfo"}
+		var missing []string
+		for _, depend := range dependencies {
+			if _, err := os.Stat(path.Join("/usr/bin/", depend)); err != nil {
+				missing = append(missing, depend)
+			}
+		}
+		if len(missing) != 0 {
+			fmt.Println("[WARNING] Stormfetch functionality may be limited due to the following dependencies not being installed:")
+			for _, depend := range missing {
+				fmt.Println(depend)
+			}
+			fmt.Println("You can disable this warning through your stormfetch config")
+		}
+	}
 	//Execute fetch script
 	cmd := exec.Command("/bin/bash", fetchScriptPath)
 	cmd.Dir = path.Dir(fetchScriptPath)