From 10b877cf7bee89cf41f48ff5b8a956311bc41cdb Mon Sep 17 00:00:00 2001
From: jetfir3 <95306468+jetfir3@users.noreply.github.com>
Date: Thu, 27 Oct 2022 15:57:16 -0400
Subject: [PATCH] Jet test flatpak 1 (#9)

* Search for Spotify directory if not found in PATH
* Update install.sh
* Confirm directory provided with `-P` exists
* Confirm xpui exists in `-P` directory
---
 README.md  |  4 ++--
 install.sh | 44 +++++++++++++++++++++++++++++---------------
 2 files changed, 31 insertions(+), 17 deletions(-)

diff --git a/README.md b/README.md
index 828a98a..af37e4d 100644
--- a/README.md
+++ b/README.md
@@ -10,9 +10,9 @@
 ***
 
 <center>
-    <h4 align="center">A multi-featured adblocker for the Spotify desktop client for Linux.</h4>
+    <h4 align="center">A multi-featured adblocker for the Spotify Linux application.</h4>
     <p align="center">
-        <strong>Last updated:</strong> 20 October 2022<br>
+        <strong>Last updated:</strong> 27 October 2022<br>
         <strong>Last tested version:</strong> 1.1.84.716
     </p> 
 </center>
diff --git a/install.sh b/install.sh
index 85aff56..7169966 100644
--- a/install.sh
+++ b/install.sh
@@ -27,9 +27,35 @@ while getopts 'cefP:p' flag; do
   esac
 done
 
-# path vars
+# Credits
+echo
+echo "**************************"
+echo "SpotX-Linux by @SpotX-CLI"
+echo "**************************"
+echo
+
+# Locate install directory
 if [ -z ${INSTALL_PATH+x} ]; then 
-  INSTALL_PATH=$(readlink -e `type -p spotify` 2>/dev/null | rev | cut -d/ -f2- | rev); fi
+  INSTALL_PATH=$(readlink -e `type -p spotify` 2>/dev/null | rev | cut -d/ -f2- | rev)
+  if [[ -d "${INSTALL_PATH}" ]]; then
+    echo "Spotify directory found in PATH: ${INSTALL_PATH}"
+  elif [[ ! -d "${INSTALL_PATH}" ]]; then
+    echo -e "\nSpotify not found in PATH. Searching for Spotify directory..."
+    INSTALL_PATH=$(timeout 10 find / -type f -path "*/spotify/Apps/*" -name "xpui.spa" -size -7M -size +3M -print -quit 2>/dev/null | rev | cut -d/ -f3- | rev)
+    if [[ -d "${INSTALL_PATH}" ]]; then
+      echo "Spotify directory found: ${INSTALL_PATH}"
+    elif [[ ! -d "${INSTALL_PATH}" ]]; then
+      echo "Spotify directory not found. Set directory path with -P flag.\nExiting...\n"
+      exit; fi; fi
+else
+  if [[ ! -d "${INSTALL_PATH}" ]]; then
+    echo -e "Directory path set by -P was not found.\nExiting...\n"
+    exit
+  elif [[ ! -f "${INSTALL_PATH}/Apps/xpui.spa" ]]; then
+    echo -e "No xpui found in directory provided with -P.\nPlease confirm directory and try again or re-install Spotify.\nExiting...\n"
+    exit; fi; fi
+     
+# Path vars
 CACHE_PATH="${HOME}/.cache/spotify/"
 XPUI_PATH="${INSTALL_PATH}/Apps"
 XPUI_DIR="${XPUI_PATH}/xpui"
@@ -87,21 +113,9 @@ CONNECT_2='s|connect-picker.unavailable-to-control|spotify-connect|'
 CONNECT_3='s|(className:.,disabled:)(..)|$1false|'
 CONNECT_4='s/return (..isDisabled)(\?(..createElement|\(.{1,10}\))\(..,)/return false$2/'
 
-# Credits
-echo
-echo "**************************"
-echo "SpotX-Linux by @SpotX-CLI"
-echo "**************************"
-echo
-
-# Detect client in PATH
-if [[ ! -d "${INSTALL_PATH}" ]]; then
-  echo -e "\nSpotify path not found.\nSet directory path with -P flag.\nExiting...\n"
-  exit; fi
-
 # xpui detection
 if [[ ! -f "${XPUI_SPA}" ]]; then
-  echo - e "\nxpui not found!\nReinstall Spotify then try again.\nExiting...\n"
+  echo -e "\nxpui not found!\nReinstall Spotify then try again.\nExiting...\n"
   exit
 else
   if [[ ! -w "${XPUI_PATH}" ]]; then