From 34f50ad101ca71b459f5dfd5716712dd01183e8e Mon Sep 17 00:00:00 2001 From: n1koo Date: Wed, 14 Jun 2017 08:23:38 +0300 Subject: [PATCH 1/2] Remove deprecated source from plexupdate.sh --- plexupdate.sh | 2 -- 1 file changed, 2 deletions(-) diff --git a/plexupdate.sh b/plexupdate.sh index 6a62b79..90de9fc 100755 --- a/plexupdate.sh +++ b/plexupdate.sh @@ -335,8 +335,6 @@ if [ "${CHECKUPDATE}" = "yes" -a "${AUTOUPDATE}" = "no" ]; then fi if [ "${PUBLIC}" = "no" -a -z "$TOKEN" ]; then - TO_SOURCE="$(dirname "$0")/extras/get-plex-token" - [ -f "$TO_SOURCE" ] && source $TO_SOURCE if ! getPlexToken; then error "Unable to get Plex token, falling back to public release" PUBLIC="yes" From 5695d236e23e44e9b7f28fa7f1128cebdb18781c Mon Sep 17 00:00:00 2001 From: n1koo Date: Wed, 14 Jun 2017 12:57:09 +0300 Subject: [PATCH 2/2] Add check for getPlexToken() in plexupdate.sh --- plexupdate.sh | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/plexupdate.sh b/plexupdate.sh index 90de9fc..dd336a9 100755 --- a/plexupdate.sh +++ b/plexupdate.sh @@ -335,6 +335,11 @@ if [ "${CHECKUPDATE}" = "yes" -a "${AUTOUPDATE}" = "no" ]; then fi if [ "${PUBLIC}" = "no" -a -z "$TOKEN" ]; then + declare -f getPlexToken > /dev/null + if [ $? -ne 0 ]; then + error "getPlexToken() function missing, check that it its sourced correctly" + exit 3 + fi if ! getPlexToken; then error "Unable to get Plex token, falling back to public release" PUBLIC="yes"