github/plexupdate
1
0
Fork 0
mirror of https://github.com/mrworf/plexupdate.git synced 2025-07-16 02:02:58 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge remote-tracking branch 'origin/master' into keepreverted

Browse source
This commit is contained in:
Nicholas Sperling 2019-03-17 14:43:51 -04:00
commit d9f2ea78ba
2 changed files with 18 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

2
plexupdate-core
View file

@ -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

21
plexupdate.sh
View file

@ -305,7 +305,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}"
@ -314,8 +318,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
@ -347,6 +356,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
@ -496,7 +509,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