From e86783b6c09fa9e579e48781b0aacc5370f299ca Mon Sep 17 00:00:00 2001
From: Rory Fewell <roryf@oddmatics.uk>
Date: Wed, 26 Jul 2023 18:22:06 +0100
Subject: [PATCH] Bugfix: Fixes #203, Failing to identify Linux Mint

---
 base/bootvid/README.MD    |  2 +-
 packaging/distid.sh       | 41 ++++++++++++++++++++++-----------------
 shared/shelldpa/README.MD |  5 +++++
 3 files changed, 29 insertions(+), 19 deletions(-)
 create mode 100644 shared/shelldpa/README.MD

diff --git a/base/bootvid/README.MD b/base/bootvid/README.MD
index 8101eb8..75fb473 100644
--- a/base/bootvid/README.MD
+++ b/base/bootvid/README.MD
@@ -1,3 +1,3 @@
 # bootvid
 This directory contains the source-code for the boot splash.
-![Windows XP Splash](https://github.com/rozniak/xfce-winxp-tc/blob/feat-204/base/bootvid/res/splshclx.png?raw=true)
+![Windows XP Splash](https://github.com/rozniak/xfce-winxp-tc/blob/master/base/bootvid/res/splshclx.png?raw=true)
diff --git a/packaging/distid.sh b/packaging/distid.sh
index abdbec3..ab22c1c 100755
--- a/packaging/distid.sh
+++ b/packaging/distid.sh
@@ -12,27 +12,32 @@
 #
 # MAIN SCRIPT
 #
-if [[ ! -f "/etc/os-release" ]]
+
+# Probe for package managers to try and determine what distro we're
+# on
+#
+
+# Check Debian
+# 
+which dpkg >/dev/null 2>&1
+
+if [[ $? -eq 0 ]]
 then
-    echo "Unable to identify distribution."
-    exit 1
+    echo -n "deb"
+    exit 0
 fi
 
-# Retrieve distro ID
+# Check Arch Linux
 #
-distro_in_use=`cat /etc/os-release | grep "^ID" | cut -d"=" -f2`
+which pacman >/dev/null 2>&1
 
-case "${distro_in_use}" in
-    arch)
-        echo -n "archpkg"
-        ;;
+if [[ $? -eq 0 ]]
+then
+    echo -n "archpkg"
+    exit 0
+fi
 
-    debian)
-        echo -n "deb"
-        ;;
-
-    *)
-        echo "Unsupported distribution."
-        exit 1
-        ;;
-esac
+# Nothing else to probe, it's over!
+#
+echo "Unsupported distribution."
+exit 1
diff --git a/shared/shelldpa/README.MD b/shared/shelldpa/README.MD
new file mode 100644
index 0000000..5affd39
--- /dev/null
+++ b/shared/shelldpa/README.MD
@@ -0,0 +1,5 @@
+# libwintc-shelldpa
+This directory contains the source-code for the Shell Display Protocol Abstraction library.
+
+## Purpose
+This library abstracts away differences in display protocols for APIs that require interacting with them. For instance, window management varies between X and Wayland - so this library attempts to use WNCK / xfce4windowing where it can.