From 7723dfc97be9daf7c7c8744f26a9fe648aa2f508 Mon Sep 17 00:00:00 2001 From: Alex Malinovich Date: Mon, 11 Feb 2019 22:22:36 -0800 Subject: [PATCH] Switch to new API endpoint for PlexPass downloads. Fixes #224 --- plexupdate-core | 2 +- plexupdate.sh | 21 +++++++++++++++++---- 2 files changed, 18 insertions(+), 5 deletions(-) diff --git a/plexupdate-core b/plexupdate-core index 751c196..63bff24 100755 --- a/plexupdate-core +++ b/plexupdate-core @@ -10,7 +10,7 @@ ######## CONSTANTS ######## # Current pages we need - Do not change unless Plex.tv changes again URL_LOGIN='https://plex.tv/users/sign_in.json' -URL_DOWNLOAD='https://plex.tv/api/downloads/1.json?channel=plexpass' +URL_DOWNLOAD='https://plex.tv/api/downloads/5.json?channel=plexpass' URL_DOWNLOAD_PUBLIC='https://plex.tv/api/downloads/1.json' # Default options for package managers, override if needed diff --git a/plexupdate.sh b/plexupdate.sh index c9d46ca..f85c585 100755 --- a/plexupdate.sh +++ b/plexupdate.sh @@ -300,7 +300,11 @@ if [ -z "${DISTRO_INSTALL}" ]; then # Detect if we're running on redhat instead of ubuntu if [ -f /etc/redhat-release ]; then REDHAT=yes - BUILD="linux-ubuntu-${ARCH}" + if [ "${PUBLIC}" = "yes" ]; then + BUILD="linux-ubuntu-${ARCH}" + else + BUILD="linux-${ARCH}" + fi DISTRO="redhat" if ! hash dnf 2>/dev/null; then DISTRO_INSTALL="${REDHAT_INSTALL/dnf/yum}" @@ -309,8 +313,13 @@ if [ -z "${DISTRO_INSTALL}" ]; then fi else REDHAT=no - BUILD="linux-ubuntu-${ARCH}" - DISTRO="ubuntu" + if [ "${PUBLIC}" = yes ]; then + BUILD="linux-ubuntu-${ARCH}" + DISTRO="ubuntu" + else + BUILD="linux-${ARCH}" + DISTRO="debian" + fi DISTRO_INSTALL="${DEBIAN_INSTALL}" fi elif [ -z "${DISTRO}" -o -z "${BUILD}" ]; then @@ -342,6 +351,10 @@ fi if [ "${PUBLIC}" = "no" ] && ! getPlexToken; then error "Unable to get Plex token, falling back to public release" PUBLIC="yes" + BUILD="linux-ubuntu-${ARCH}" + if [ "${REDHAT}" = "yes" ]; then + DISTRO="ubuntu" + fi fi if [ "$PUBLIC" != "no" ]; then @@ -487,7 +500,7 @@ if [ -n "${PLEXSERVER}" -a "${AUTOINSTALL}" = "yes" ]; then fi if [ "${AUTOINSTALL}" = "yes" ]; then - if ! hash ldconfig 2>/dev/null && [ "${DISTRO}" = "ubuntu" ]; then + if ! hash ldconfig 2>/dev/null && [ "${REDHAT}" = "no" ]; then export PATH=$PATH:/sbin fi