Merge pull request #40 from Elsie19/main

Format with shfmt
This commit is contained in:
Nuzair 2023-07-03 18:41:27 +05:30 committed by GitHub
commit a9e26bf3b4
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 278 additions and 234 deletions

View File

@ -3,9 +3,18 @@
SPOTX_VERSION="1.2.3.1115-1" SPOTX_VERSION="1.2.3.1115-1"
# Dependencies check # Dependencies check
command -v perl >/dev/null || { echo -e "\nperl was not found, please install. Exiting...\n" >&2; exit 1; } command -v perl > /dev/null || {
command -v unzip >/dev/null || { echo -e "\nunzip was not found, please install. Exiting...\n" >&2; exit 1; } echo -e "\nperl was not found, please install. Exiting...\n" >&2
command -v zip >/dev/null || { echo -e "\nzip was not found, please install. Exiting...\n" >&2; exit 1; } exit 1
}
command -v unzip > /dev/null || {
echo -e "\nunzip was not found, please install. Exiting...\n" >&2
exit 1
}
command -v zip > /dev/null || {
echo -e "\nzip was not found, please install. Exiting...\n" >&2
exit 1
}
# Script flags # Script flags
CACHE_FLAG='false' CACHE_FLAG='false'
@ -24,17 +33,19 @@ while getopts 'cefhopP:' flag; do
o) OLD_UI_FLAG='true' ;; o) OLD_UI_FLAG='true' ;;
P) P)
PATH_FLAG="${OPTARG}" PATH_FLAG="${OPTARG}"
INSTALL_PATH="${PATH_FLAG}" ;; INSTALL_PATH="${PATH_FLAG}"
;;
p) PREMIUM_FLAG='true' ;; p) PREMIUM_FLAG='true' ;;
*) *)
echo "Error: Flag not supported." echo "Error: Flag not supported."
exit ;; exit
;;
esac esac
done done
# Handle exclude flag(s) # Handle exclude flag(s)
for EXCLUDE_VAL in "${EXCLUDE_FLAG[@]}"; do for EXCLUDE_VAL in "${EXCLUDE_FLAG[@]}"; do
if [[ "${EXCLUDE_VAL}" == "leftsidebar" ]]; then EX_LEFTSIDEBAR='true'; fi if [[ ${EXCLUDE_VAL} == "leftsidebar" ]]; then EX_LEFTSIDEBAR='true'; fi
done done
# Perl command # Perl command
@ -117,38 +128,43 @@ echo -e "SpotX-Linux version: ${SPOTX_VERSION}\n"
# Locate install directory # Locate install directory
if [ -z ${INSTALL_PATH+x} ]; then if [ -z ${INSTALL_PATH+x} ]; then
INSTALL_PATH=$(readlink -e `type -p spotify` 2>/dev/null | rev | cut -d/ -f2- | rev) INSTALL_PATH=$(readlink -e $(type -p spotify) 2> /dev/null | rev | cut -d/ -f2- | rev)
if [[ -d "${INSTALL_PATH}" && "${INSTALL_PATH}" != "/usr/bin" ]]; then if [[ -d ${INSTALL_PATH} && ${INSTALL_PATH} != "/usr/bin" ]]; then
echo "Spotify directory found in PATH: ${INSTALL_PATH}" echo "Spotify directory found in PATH: ${INSTALL_PATH}"
elif [[ ! -d "${INSTALL_PATH}" ]]; then elif [[ ! -d ${INSTALL_PATH} ]]; then
echo -e "\nSpotify not found in PATH. Searching for Spotify directory..." 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) 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 if [[ -d ${INSTALL_PATH} ]]; then
echo "Spotify directory found: ${INSTALL_PATH}" echo "Spotify directory found: ${INSTALL_PATH}"
elif [[ ! -d "${INSTALL_PATH}" ]]; then elif [[ ! -d ${INSTALL_PATH} ]]; then
echo -e "Spotify directory not found. Set directory path with -P flag.\nExiting...\n" echo -e "Spotify directory not found. Set directory path with -P flag.\nExiting...\n"
exit; fi exit
elif [[ "${INSTALL_PATH}" == "/usr/bin" ]]; then fi
elif [[ ${INSTALL_PATH} == "/usr/bin" ]]; then
echo -e "\nSpotify PATH is set to /usr/bin, searching for Spotify directory..." echo -e "\nSpotify PATH is set to /usr/bin, 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) 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}" && "${INSTALL_PATH}" != "/usr/bin" ]]; then if [[ -d ${INSTALL_PATH} && ${INSTALL_PATH} != "/usr/bin" ]]; then
echo "Spotify directory found: ${INSTALL_PATH}" echo "Spotify directory found: ${INSTALL_PATH}"
elif [[ "${INSTALL_PATH}" == "/usr/bin" ]] || [[ ! -d "${INSTALL_PATH}" ]]; then elif [[ ${INSTALL_PATH} == "/usr/bin" ]] || [[ ! -d ${INSTALL_PATH} ]]; then
echo -e "Spotify directory not found. Set directory path with -P flag.\nExiting...\n" echo -e "Spotify directory not found. Set directory path with -P flag.\nExiting...\n"
exit; fi; fi exit
fi
fi
else else
if [[ ! -d "${INSTALL_PATH}" ]]; then if [[ ! -d ${INSTALL_PATH} ]]; then
echo -e "Directory path set by -P was not found.\nExiting...\n" echo -e "Directory path set by -P was not found.\nExiting...\n"
exit exit
elif [[ ! -f "${INSTALL_PATH}/Apps/xpui.spa" ]]; then 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" 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 exit
fi
fi
# Find client version # Find client version
CLIENT_VERSION=$("${INSTALL_PATH}"/spotify --version | cut -dn -f2- | rev | cut -d. -f2- | rev) CLIENT_VERSION=$("${INSTALL_PATH}"/spotify --version | cut -dn -f2- | rev | cut -d. -f2- | rev)
# Version function for version comparison # Version function for version comparison
function ver { echo "$@" | awk -F. '{ printf("%d%03d%03d%03d\n", $1,$2,$3,$4); }'; } function ver() { echo "$@" | awk -F. '{ printf("%d%03d%03d%03d\n", $1,$2,$3,$4); }'; }
# Report Spotify version # Report Spotify version
echo -e "\nSpotify version: ${CLIENT_VERSION}\n" echo -e "\nSpotify version: ${CLIENT_VERSION}\n"
@ -165,15 +181,16 @@ HOME_V2_JS="${XPUI_DIR}/home-v2.js"
VENDOR_XPUI_JS="${XPUI_DIR}/vendor~xpui.js" VENDOR_XPUI_JS="${XPUI_DIR}/vendor~xpui.js"
# xpui detection # xpui detection
if [[ ! -f "${XPUI_SPA}" ]]; then 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 exit
else else
if [[ ! -w "${XPUI_PATH}" ]]; then if [[ ! -w ${XPUI_PATH} ]]; then
echo -e "\nSpotX does not have write permission in Spotify directory.\nRequesting sudo permission...\n" echo -e "\nSpotX does not have write permission in Spotify directory.\nRequesting sudo permission...\n"
sudo chmod a+wr "${INSTALL_PATH}" && sudo chmod a+wr -R "${XPUI_PATH}"; fi sudo chmod a+wr "${INSTALL_PATH}" && sudo chmod a+wr -R "${XPUI_PATH}"
if [[ "${FORCE_FLAG}" == "false" ]]; then fi
if [[ -f "${XPUI_BAK}" ]]; then if [[ ${FORCE_FLAG} == "false" ]]; then
if [[ -f ${XPUI_BAK} ]]; then
echo "SpotX backup found, SpotX has already been used on this install." echo "SpotX backup found, SpotX has already been used on this install."
echo -e "Re-run SpotX using the '-f' flag to force xpui patching.\n" echo -e "Re-run SpotX using the '-f' flag to force xpui patching.\n"
echo "Skipping xpui patches and continuing SpotX..." echo "Skipping xpui patches and continuing SpotX..."
@ -181,9 +198,10 @@ else
else else
echo "Creating xpui backup..." echo "Creating xpui backup..."
cp "${XPUI_SPA}" "${XPUI_BAK}" cp "${XPUI_SPA}" "${XPUI_BAK}"
XPUI_SKIP="false"; fi XPUI_SKIP="false"
fi
else else
if [[ -f "${XPUI_BAK}" ]]; then if [[ -f ${XPUI_BAK} ]]; then
echo "Backup xpui found, restoring original..." echo "Backup xpui found, restoring original..."
rm "${XPUI_SPA}" rm "${XPUI_SPA}"
cp "${XPUI_BAK}" "${XPUI_SPA}" cp "${XPUI_BAK}" "${XPUI_SPA}"
@ -191,10 +209,13 @@ else
else else
echo "Creating xpui backup..." echo "Creating xpui backup..."
cp "${XPUI_SPA}" "${XPUI_BAK}" cp "${XPUI_SPA}" "${XPUI_BAK}"
XPUI_SKIP="false"; fi; fi; fi XPUI_SKIP="false"
fi
fi
fi
# Extract xpui.spa # Extract xpui.spa
if [[ "${XPUI_SKIP}" == "false" ]]; then if [[ ${XPUI_SKIP} == "false" ]]; then
echo "Extracting xpui..." echo "Extracting xpui..."
unzip -qq "${XPUI_SPA}" -d "${XPUI_DIR}" unzip -qq "${XPUI_SPA}" -d "${XPUI_DIR}"
if grep -Fq "SpotX" "${XPUI_JS}"; then if grep -Fq "SpotX" "${XPUI_JS}"; then
@ -202,15 +223,17 @@ if [[ "${XPUI_SKIP}" == "false" ]]; then
echo -e "Further xpui patching not allowed until Spotify is reinstalled/upgraded.\n" echo -e "Further xpui patching not allowed until Spotify is reinstalled/upgraded.\n"
echo "Skipping xpui patches and continuing SpotX..." echo "Skipping xpui patches and continuing SpotX..."
XPUI_SKIP="true" XPUI_SKIP="true"
rm "${XPUI_BAK}" 2>/dev/null rm "${XPUI_BAK}" 2> /dev/null
rm -rf "${XPUI_DIR}" 2>/dev/null rm -rf "${XPUI_DIR}" 2> /dev/null
else else
rm "${XPUI_SPA}"; fi; fi rm "${XPUI_SPA}"
fi
fi
echo "Applying SpotX patches..." echo "Applying SpotX patches..."
if [[ "${XPUI_SKIP}" == "false" ]]; then if [[ ${XPUI_SKIP} == "false" ]]; then
if [[ "${PREMIUM_FLAG}" == "false" ]]; then if [[ ${PREMIUM_FLAG} == "false" ]]; then
# Remove Empty ad block # Remove Empty ad block
echo "Removing ad-related content..." echo "Removing ad-related content..."
$PERL "${AD_EMPTY_AD_BLOCK}" "${XPUI_JS}" $PERL "${AD_EMPTY_AD_BLOCK}" "${XPUI_JS}"
@ -234,63 +257,69 @@ if [[ "${XPUI_SKIP}" == "false" ]]; then
# Unlock Spotify Connect # Unlock Spotify Connect
echo "Unlocking Spotify Connect..." echo "Unlocking Spotify Connect..."
if [[ $(ver "${CLIENT_VERSION}") -ge $(ver "1.1.70.610") && $(ver "${CLIENT_VERSION}") -lt $(ver "1.1.91.824") ]]; then if (($(ver "${CLIENT_VERSION}") >= $(ver "1.1.70.610") && $(ver "${CLIENT_VERSION}") < $(ver "1.1.91.824"))); then
$PERL "${CONNECT_OLD_1}" "${XPUI_JS}" $PERL "${CONNECT_OLD_1}" "${XPUI_JS}"
$PERL "${CONNECT_OLD_2}" "${XPUI_JS}" $PERL "${CONNECT_OLD_2}" "${XPUI_JS}"
$PERL "${CONNECT_OLD_3}" "${XPUI_JS}" $PERL "${CONNECT_OLD_3}" "${XPUI_JS}"
elif [[ $(ver "${CLIENT_VERSION}") -ge $(ver "1.1.91.824") && $(ver "${CLIENT_VERSION}") -lt $(ver "1.1.96.783") ]]; then elif (($(ver "${CLIENT_VERSION}") >= $(ver "1.1.91.824") && $(ver "${CLIENT_VERSION}") < $(ver "1.1.96.783"))); then
$PERL "${DEVICE_PICKER_NEW}" "${XPUI_JS}" $PERL "${DEVICE_PICKER_NEW}" "${XPUI_JS}"
$PERL "${CONNECT_NEW}" "${XPUI_JS}" $PERL "${CONNECT_NEW}" "${XPUI_JS}"
elif [[ $(ver "${CLIENT_VERSION}") -gt $(ver "1.1.96.783") ]]; then elif (($(ver "${CLIENT_VERSION}") > $(ver "1.1.96.783"))); then
$PERL "${CONNECT_NEW}" "${XPUI_JS}"; fi $PERL "${CONNECT_NEW}" "${XPUI_JS}"
fi
else else
echo "Premium subscription setup selected..."; fi; fi echo "Premium subscription setup selected..."
fi
fi
# Experimental patches # Experimental patches
if [[ "${XPUI_SKIP}" == "false" ]]; then if [[ ${XPUI_SKIP} == "false" ]]; then
if [[ "${EXPERIMENTAL_FLAG}" == "true" ]]; then if [[ ${EXPERIMENTAL_FLAG} == "true" ]]; then
echo "Adding experimental features..." echo "Adding experimental features..."
if [[ $(ver "${CLIENT_VERSION}") -ge $(ver "1.1.99.871") ]]; then $PERL "${ENABLE_ADD_PLAYLIST}" "${XPUI_JS}"; fi if (($(ver "${CLIENT_VERSION}") >= $(ver "1.1.99.871"))); then $PERL "${ENABLE_ADD_PLAYLIST}" "${XPUI_JS}"; fi
if [[ $(ver "${CLIENT_VERSION}") -ge $(ver "1.1.99.871") ]]; then $PERL "${ENABLE_BAD_BUNNY}" "${XPUI_JS}"; fi if (($(ver "${CLIENT_VERSION}") >= $(ver "1.1.99.871"))); then $PERL "${ENABLE_BAD_BUNNY}" "${XPUI_JS}"; fi
if [[ $(ver "${CLIENT_VERSION}") -ge $(ver "1.1.89.854") ]]; then $PERL "${ENABLE_BALLOONS}" "${XPUI_JS}"; fi if (($(ver "${CLIENT_VERSION}") >= $(ver "1.1.89.854"))); then $PERL "${ENABLE_BALLOONS}" "${XPUI_JS}"; fi
if [[ $(ver "${CLIENT_VERSION}") -ge $(ver "1.1.70.610") ]]; then $PERL "${ENABLE_BLOCK_USERS}" "${XPUI_JS}"; fi if (($(ver "${CLIENT_VERSION}") >= $(ver "1.1.70.610"))); then $PERL "${ENABLE_BLOCK_USERS}" "${XPUI_JS}"; fi
if [[ $(ver "${CLIENT_VERSION}") -ge $(ver "1.1.93.896") ]]; then $PERL "${ENABLE_CAROUSELS}" "${XPUI_JS}"; fi if (($(ver "${CLIENT_VERSION}") >= $(ver "1.1.93.896"))); then $PERL "${ENABLE_CAROUSELS}" "${XPUI_JS}"; fi
if [[ $(ver "${CLIENT_VERSION}") -ge $(ver "1.1.92.644") && $(ver "${CLIENT_VERSION}") -lt $(ver "1.1.99.871") ]]; then $PERL "${ENABLE_CLEAR_DOWNLOADS}" "${XPUI_JS}"; fi if (($(ver "${CLIENT_VERSION}") >= $(ver "1.1.92.644") && $(ver "${CLIENT_VERSION}") < $(ver "1.1.99.871"))); then $PERL "${ENABLE_CLEAR_DOWNLOADS}" "${XPUI_JS}"; fi
if [[ $(ver "${CLIENT_VERSION}") -ge $(ver "1.1.99.871") ]]; then $PERL "${ENABLE_DEVICE_LIST_LOCAL}" "${XPUI_JS}"; fi if (($(ver "${CLIENT_VERSION}") >= $(ver "1.1.99.871"))); then $PERL "${ENABLE_DEVICE_LIST_LOCAL}" "${XPUI_JS}"; fi
if [[ $(ver "${CLIENT_VERSION}") -ge $(ver "1.1.79.763") ]]; then $PERL "${ENABLE_DISCOG_SHELF}" "${XPUI_JS}"; fi if (($(ver "${CLIENT_VERSION}") >= $(ver "1.1.79.763"))); then $PERL "${ENABLE_DISCOG_SHELF}" "${XPUI_JS}"; fi
if [[ $(ver "${CLIENT_VERSION}") -ge $(ver "1.1.84.716") ]]; then $PERL "${ENABLE_ENHANCE_PLAYLIST}" "${XPUI_JS}"; fi if (($(ver "${CLIENT_VERSION}") >= $(ver "1.1.84.716"))); then $PERL "${ENABLE_ENHANCE_PLAYLIST}" "${XPUI_JS}"; fi
if [[ $(ver "${CLIENT_VERSION}") -ge $(ver "1.1.86.857") ]]; then $PERL "${ENABLE_ENHANCE_SONGS}" "${XPUI_JS}"; fi if (($(ver "${CLIENT_VERSION}") >= $(ver "1.1.86.857"))); then $PERL "${ENABLE_ENHANCE_SONGS}" "${XPUI_JS}"; fi
if [[ $(ver "${CLIENT_VERSION}") -ge $(ver "1.1.88.595") ]]; then $PERL "${ENABLE_EQUALIZER}" "${XPUI_JS}"; fi if (($(ver "${CLIENT_VERSION}") >= $(ver "1.1.88.595"))); then $PERL "${ENABLE_EQUALIZER}" "${XPUI_JS}"; fi
if [[ $(ver "${CLIENT_VERSION}") -ge $(ver "1.2.1.958") ]]; then $PERL "${ENABLE_FOLLOWERS_ON_PROFILE}" "${XPUI_JS}"; fi if (($(ver "${CLIENT_VERSION}") >= $(ver "1.2.1.958"))); then $PERL "${ENABLE_FOLLOWERS_ON_PROFILE}" "${XPUI_JS}"; fi
if [[ $(ver "${CLIENT_VERSION}") -ge $(ver "1.2.0.1155") ]]; then $PERL "${ENABLE_FORGET_DEVICES}" "${XPUI_JS}"; fi if (($(ver "${CLIENT_VERSION}") >= $(ver "1.2.0.1155"))); then $PERL "${ENABLE_FORGET_DEVICES}" "${XPUI_JS}"; fi
if [[ $(ver "${CLIENT_VERSION}") -ge $(ver "1.1.87.612") ]]; then $PERL "${ENABLE_IGNORE_REC}" "${XPUI_JS}"; fi if (($(ver "${CLIENT_VERSION}") >= $(ver "1.1.87.612"))); then $PERL "${ENABLE_IGNORE_REC}" "${XPUI_JS}"; fi
if [[ $(ver "${CLIENT_VERSION}") -ge $(ver "1.1.70.610") ]]; then $PERL "${ENABLE_LIKED_SONGS}" "${XPUI_JS}"; fi if (($(ver "${CLIENT_VERSION}") >= $(ver "1.1.70.610"))); then $PERL "${ENABLE_LIKED_SONGS}" "${XPUI_JS}"; fi
if [[ $(ver "${CLIENT_VERSION}") -ge $(ver "1.1.70.610") && $(ver "${CLIENT_VERSION}") -lt $(ver "1.1.94.864") ]]; then $PERL "${ENABLE_LYRICS_CHECK}" "${XPUI_JS}"; fi if (($(ver "${CLIENT_VERSION}") >= $(ver "1.1.70.610") && $(ver "${CLIENT_VERSION}") < $(ver "1.1.94.864"))); then $PERL "${ENABLE_LYRICS_CHECK}" "${XPUI_JS}"; fi
if [[ $(ver "${CLIENT_VERSION}") -ge $(ver "1.1.87.612") ]]; then $PERL "${ENABLE_LYRICS_MATCH}" "${XPUI_JS}"; fi if (($(ver "${CLIENT_VERSION}") >= $(ver "1.1.87.612"))); then $PERL "${ENABLE_LYRICS_MATCH}" "${XPUI_JS}"; fi
if [[ $(ver "${CLIENT_VERSION}") -ge $(ver "1.1.70.610") && $(ver "${CLIENT_VERSION}") -lt $(ver "1.1.96.783") ]]; then $PERL "${ENABLE_MADE_FOR_YOU}" "${XPUI_JS}"; fi if (($(ver "${CLIENT_VERSION}") >= $(ver "1.1.70.610") && $(ver "${CLIENT_VERSION}") < $(ver "1.1.96.783"))); then $PERL "${ENABLE_MADE_FOR_YOU}" "${XPUI_JS}"; fi
if [[ $(ver "${CLIENT_VERSION}") -ge $(ver "1.1.91.824") ]]; then $PERL "${ENABLE_PATHFINDER_DATA}" "${XPUI_JS}"; fi if (($(ver "${CLIENT_VERSION}") >= $(ver "1.1.91.824"))); then $PERL "${ENABLE_PATHFINDER_DATA}" "${XPUI_JS}"; fi
if [[ $(ver "${CLIENT_VERSION}") -ge $(ver "1.1.70.610") && $(ver "${CLIENT_VERSION}") -lt $(ver "1.1.94.864") ]]; then $PERL "${ENABLE_PLAYLIST_CREATION_FLOW}" "${XPUI_JS}"; fi if (($(ver "${CLIENT_VERSION}") >= $(ver "1.1.70.610") && $(ver "${CLIENT_VERSION}") < $(ver "1.1.94.864"))); then $PERL "${ENABLE_PLAYLIST_CREATION_FLOW}" "${XPUI_JS}"; fi
if [[ $(ver "${CLIENT_VERSION}") -ge $(ver "1.1.75.572") ]]; then $PERL "${ENABLE_PLAYLIST_PERMISSIONS_FLOWS}" "${XPUI_JS}"; fi if (($(ver "${CLIENT_VERSION}") >= $(ver "1.1.75.572"))); then $PERL "${ENABLE_PLAYLIST_PERMISSIONS_FLOWS}" "${XPUI_JS}"; fi
if [[ $(ver "${CLIENT_VERSION}") -ge $(ver "1.2.0.1165") ]]; then $PERL "${ENABLE_PODCAST_PLAYBACK_SPEED}" "${XPUI_JS}"; fi if (($(ver "${CLIENT_VERSION}") >= $(ver "1.2.0.1165"))); then $PERL "${ENABLE_PODCAST_PLAYBACK_SPEED}" "${XPUI_JS}"; fi
if [[ $(ver "${CLIENT_VERSION}") -ge $(ver "1.1.99.871") ]]; then $PERL "${ENABLE_PODCAST_TRIMMING}" "${XPUI_JS}"; fi if (($(ver "${CLIENT_VERSION}") >= $(ver "1.1.99.871"))); then $PERL "${ENABLE_PODCAST_TRIMMING}" "${XPUI_JS}"; fi
if [[ $(ver "${CLIENT_VERSION}") -ge $(ver "1.1.86.857") && $(ver "${CLIENT_VERSION}") -lt $(ver "1.1.94.864") ]]; then $PERL "${ENABLE_SEARCH_BOX}" "${XPUI_JS}"; fi if (($(ver "${CLIENT_VERSION}") >= $(ver "1.1.86.857") && $(ver "${CLIENT_VERSION}") < $(ver "1.1.94.864"))); then $PERL "${ENABLE_SEARCH_BOX}" "${XPUI_JS}"; fi
if [[ $(ver "${CLIENT_VERSION}") -ge $(ver "1.1.85.884") ]]; then $PERL "${ENABLE_SIMILAR_PLAYLIST}" "${XPUI_JS}"; fi; fi; fi if (($(ver "${CLIENT_VERSION}") >= $(ver "1.1.85.884"))); then $PERL "${ENABLE_SIMILAR_PLAYLIST}" "${XPUI_JS}"; fi
fi
fi
# Remove logging # Remove logging
if [[ "${XPUI_SKIP}" == "false" ]]; then if [[ ${XPUI_SKIP} == "false" ]]; then
echo "Removing logging..." echo "Removing logging..."
$PERL "${LOG_1}" "${XPUI_JS}" $PERL "${LOG_1}" "${XPUI_JS}"
$PERL "${LOG_SENTRY}" "${VENDOR_XPUI_JS}"; fi $PERL "${LOG_SENTRY}" "${VENDOR_XPUI_JS}"
fi
# Handle new home screen UI # Handle new home screen UI
if [[ "${XPUI_SKIP}" == "false" ]]; then if [[ ${XPUI_SKIP} == "false" ]]; then
if [[ "${OLD_UI_FLAG}" == "true" ]]; then if [[ ${OLD_UI_FLAG} == "true" ]]; then
echo "Skipping new home UI patch..." echo "Skipping new home UI patch..."
elif [[ $(ver "${CLIENT_VERSION}") -gt $(ver "1.1.93.896") && $(ver "${CLIENT_VERSION}") -lt $(ver "1.1.97.956") ]]; then elif (($(ver "${CLIENT_VERSION}") > $(ver "1.1.93.896") && $(ver "${CLIENT_VERSION}") < $(ver "1.1.97.956"))); then
echo "Enabling new home screen UI..." echo "Enabling new home screen UI..."
$PERL "${NEW_UI}" "${XPUI_JS}" $PERL "${NEW_UI}" "${XPUI_JS}"
$PERL "${AUDIOBOOKS_CLIENTX}" "${XPUI_JS}" $PERL "${AUDIOBOOKS_CLIENTX}" "${XPUI_JS}"
elif [[ $(ver "${CLIENT_VERSION}") -ge $(ver "1.1.97.956") && $(ver "${CLIENT_VERSION}") -lt $(ver "1.2.3.1107") ]]; then elif (($(ver "${CLIENT_VERSION}") >= $(ver "1.1.97.956") && $(ver "${CLIENT_VERSION}") < $(ver "1.2.3.1107"))); then
echo "Enabling new home screen UI..." echo "Enabling new home screen UI..."
$PERL "${NEW_UI_2}" "${XPUI_JS}" $PERL "${NEW_UI_2}" "${XPUI_JS}"
$PERL "${AUDIOBOOKS_CLIENTX}" "${XPUI_JS}" $PERL "${AUDIOBOOKS_CLIENTX}" "${XPUI_JS}"
@ -299,41 +328,49 @@ if [[ "${XPUI_SKIP}" == "false" ]]; then
elif [[ $(ver "${CLIENT_VERSION}") -ge $(ver "1.2.3.1107") ]]; then elif [[ $(ver "${CLIENT_VERSION}") -ge $(ver "1.2.3.1107") ]]; then
echo "Enabling new home screen UI..." echo "Enabling new home screen UI..."
$PERL "${AUDIOBOOKS_CLIENTX}" "${XPUI_JS}" $PERL "${AUDIOBOOKS_CLIENTX}" "${XPUI_JS}"
if [[ $(ver "${CLIENT_VERSION}") -ge $(ver "1.1.97.962") ]]; then $PERL "${ENABLE_LEFT_SIDEBAR}" "${XPUI_JS}"; fi if (($(ver "${CLIENT_VERSION}") >= $(ver "1.1.97.962"))); then $PERL "${ENABLE_LEFT_SIDEBAR}" "${XPUI_JS}"; fi
if [[ $(ver "${CLIENT_VERSION}") -ge $(ver "1.1.98.683") ]]; then $PERL "${ENABLE_RIGHT_SIDEBAR}" "${XPUI_JS}"; fi if (($(ver "${CLIENT_VERSION}") >= $(ver "1.1.98.683"))); then $PERL "${ENABLE_RIGHT_SIDEBAR}" "${XPUI_JS}"; fi
if [[ $(ver "${CLIENT_VERSION}") -ge $(ver "1.2.0.1165") ]]; then $PERL "${ENABLE_RIGHT_SIDEBAR_LYRICS}" "${XPUI_JS}"; fi if (($(ver "${CLIENT_VERSION}") >= $(ver "1.2.0.1165"))); then $PERL "${ENABLE_RIGHT_SIDEBAR_LYRICS}" "${XPUI_JS}"; fi
else fi
:; fi; fi fi
# Hide podcasts, episodes and audiobooks on home screen # Hide podcasts, episodes and audiobooks on home screen
if [[ "${XPUI_SKIP}" == "false" ]]; then if [[ ${XPUI_SKIP} == "false" ]]; then
if [[ "${HIDE_PODCASTS_FLAG}" == "true" ]]; then if [[ ${HIDE_PODCASTS_FLAG} == "true" ]]; then
if [[ $(ver "${CLIENT_VERSION}") -lt $(ver "1.1.93.896") ]]; then if (($(ver "${CLIENT_VERSION}") < $(ver "1.1.93.896"))); then
echo "Hiding non-music items on home screen..." echo "Hiding non-music items on home screen..."
$PERL "${HIDE_PODCASTS}" "${XPUI_JS}" $PERL "${HIDE_PODCASTS}" "${XPUI_JS}"
elif [[ $(ver "${CLIENT_VERSION}") -ge $(ver "1.1.93.896") && $(ver "${CLIENT_VERSION}") -le $(ver "1.1.96.785") ]]; then elif (($(ver "${CLIENT_VERSION}") >= $(ver "1.1.93.896") && $(ver "${CLIENT_VERSION}") <= $(ver "1.1.96.785"))); then
echo "Hiding non-music items on home screen..." echo "Hiding non-music items on home screen..."
$PERL "${HIDE_PODCASTS2}" "${HOME_V2_JS}" $PERL "${HIDE_PODCASTS2}" "${HOME_V2_JS}"
elif [[ $(ver "${CLIENT_VERSION}") -gt $(ver "1.1.96.785") && $(ver "${CLIENT_VERSION}") -lt $(ver "1.1.98.683") ]]; then elif (($(ver "${CLIENT_VERSION}") > $(ver "1.1.96.785") && $(ver "${CLIENT_VERSION}") < $(ver "1.1.98.683"))); then
echo "Hiding non-music items on home screen..." echo "Hiding non-music items on home screen..."
$PERL "${HIDE_PODCASTS3}" "${HOME_V2_JS}" $PERL "${HIDE_PODCASTS3}" "${HOME_V2_JS}"
elif [[ $(ver "${CLIENT_VERSION}") -ge $(ver "1.1.98.683") ]]; then elif (($(ver "${CLIENT_VERSION}") >= $(ver "1.1.98.683"))); then
echo "Hiding non-music items on home screen..." echo "Hiding non-music items on home screen..."
$PERL "${HIDE_PODCASTS3}" "${XPUI_JS}"; fi; fi; fi $PERL "${HIDE_PODCASTS3}" "${XPUI_JS}"
fi
fi
fi
# Delete app cache # Delete app cache
if [[ "${CACHE_FLAG}" == "true" ]]; then if [[ ${CACHE_FLAG} == "true" ]]; then
echo "Clearing app cache..." echo "Clearing app cache..."
rm -rf "$CACHE_PATH"; fi rm -rf "$CACHE_PATH"
fi
# Rebuild xpui.spa # Rebuild xpui.spa
if [[ "${XPUI_SKIP}" == "false" ]]; then if [[ ${XPUI_SKIP} == "false" ]]; then
echo "Rebuilding xpui..." echo "Rebuilding xpui..."
echo -e "\n//# SpotX was here" >> "${XPUI_JS}"; fi echo -e "\n//# SpotX was here" >> "${XPUI_JS}"
fi
# Zip files inside xpui folder # Zip files inside xpui folder
if [[ "${XPUI_SKIP}" == "false" ]]; then if [[ ${XPUI_SKIP} == "false" ]]; then
(cd "${XPUI_DIR}"; zip -qq -r ../xpui.spa .) pushd "${XPUI_DIR}" > /dev/null
rm -rf "${XPUI_DIR}"; fi zip -qq -r ../xpui.spa .
popd > /dev/null
rm -rf "${XPUI_DIR}"
fi
echo -e "SpotX finished patching!\n" echo -e "SpotX finished patching!\n"

View File

@ -7,38 +7,45 @@ while getopts 'P:' flag; do
case "${flag}" in case "${flag}" in
P) P)
PATH_FLAG="${OPTARG}" PATH_FLAG="${OPTARG}"
INSTALL_PATH="${PATH_FLAG}" ;; INSTALL_PATH="${PATH_FLAG}"
;;
*) *)
echo "Error: Flag not supported." echo "Error: Flag not supported."
exit ;; exit
;;
esac esac
done done
# Locate install directory # Locate install directory
if [ -z ${INSTALL_PATH+x} ]; then if [ -z ${INSTALL_PATH+x} ]; then
INSTALL_PATH=$(readlink -e `type -p spotify` 2>/dev/null | rev | cut -d/ -f2- | rev) INSTALL_PATH=$(readlink -e $(type -p spotify) 2> /dev/null | rev | cut -d/ -f2- | rev)
if [[ -d "${INSTALL_PATH}" && "${INSTALL_PATH}" != "/usr/bin" ]]; then if [[ -d ${INSTALL_PATH} && ${INSTALL_PATH} != "/usr/bin" ]]; then
echo "Spotify directory found in PATH: ${INSTALL_PATH}" echo "Spotify directory found in PATH: ${INSTALL_PATH}"
elif [[ ! -d "${INSTALL_PATH}" ]]; then elif [[ ! -d ${INSTALL_PATH} ]]; then
echo -e "\nSpotify not found in PATH. Searching for Spotify directory..." 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) 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 if [[ -d ${INSTALL_PATH} ]]; then
echo "Spotify directory found: ${INSTALL_PATH}" echo "Spotify directory found: ${INSTALL_PATH}"
elif [[ ! -d "${INSTALL_PATH}" ]]; then elif [[ ! -d ${INSTALL_PATH} ]]; then
echo -e "Spotify directory not found. Set directory path with -P flag.\nExiting...\n" echo -e "Spotify directory not found. Set directory path with -P flag.\nExiting...\n"
exit; fi exit
elif [[ "${INSTALL_PATH}" == "/usr/bin" ]]; then fi
elif [[ ${INSTALL_PATH} == "/usr/bin" ]]; then
echo -e "\nSpotify PATH is set to /usr/bin, searching for Spotify directory..." echo -e "\nSpotify PATH is set to /usr/bin, 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) 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}" && "${INSTALL_PATH}" != "/usr/bin" ]]; then if [[ -d ${INSTALL_PATH} && ${INSTALL_PATH} != "/usr/bin" ]]; then
echo "Spotify directory found: ${INSTALL_PATH}" echo "Spotify directory found: ${INSTALL_PATH}"
elif [[ "${INSTALL_PATH}" == "/usr/bin" ]] || [[ ! -d "${INSTALL_PATH}" ]]; then elif [[ ${INSTALL_PATH} == "/usr/bin" ]] || [[ ! -d ${INSTALL_PATH} ]]; then
echo -e "Spotify directory not found. Set directory path with -P flag.\nExiting...\n" echo -e "Spotify directory not found. Set directory path with -P flag.\nExiting...\n"
exit; fi; fi exit
fi
fi
else else
if [[ ! -d "${INSTALL_PATH}" ]]; then if [[ ! -d ${INSTALL_PATH} ]]; then
echo -e "Directory path set by -P was not found.\nExiting...\n" echo -e "Directory path set by -P was not found.\nExiting...\n"
exit; fi; fi exit
fi
fi
# XPUI paths # XPUI paths
XPUI_PATH="${INSTALL_PATH}/Apps" XPUI_PATH="${INSTALL_PATH}/Apps"
@ -46,7 +53,7 @@ XPUI_SPA="${XPUI_PATH}/xpui.spa"
XPUI_BAK="${XPUI_PATH}/xpui.bak" XPUI_BAK="${XPUI_PATH}/xpui.bak"
# Check for backup file # Check for backup file
if [[ ! -f "${XPUI_BAK}" ]]; then if [[ ! -f ${XPUI_BAK} ]]; then
echo -e "Backup file not found.\nExiting...\n" echo -e "Backup file not found.\nExiting...\n"
exit exit
fi fi