diff --git a/plexupdate-core b/plexupdate-core index 5da6fa1..fedae8a 100755 --- a/plexupdate-core +++ b/plexupdate-core @@ -226,7 +226,7 @@ isNewerVersion() { } parseVersion() { - if [ "${REDHAT}" = "yes" ]; then + if [ "${DISTRO}" = "redhat" ]; then cut -f2- -d- <<< "$1" | cut -f1-4 -d. elif [ "${DISTRO}" = "synology" ]; then cut -f2-3 -d- <<< "$1" @@ -236,11 +236,11 @@ parseVersion() { } getPlexVersion() { - if [ "${DISTRO}" = "synology" ]; then - synopkg version "Plex Media Server" 2>/dev/null - elif [ "${REDHAT}" != "yes" ]; then + if [ "${DISTRO}" = "debian" ]; then dpkg-query --showformat='${Version}' --show plexmediaserver 2>/dev/null - elif hash rpm 2>/dev/null; then + elif [ "${DISTRO}" = "synology" ]; then + synopkg version "Plex Media Server" 2>/dev/null + elif [ "${DISTRO}" = "redhat" ]; then local rpmtemp if rpmtemp=$(rpm -q plexmediaserver); then parseVersion "$rpmtemp" diff --git a/plexupdate.sh b/plexupdate.sh index 2ad4731..5dc2e4e 100755 --- a/plexupdate.sh +++ b/plexupdate.sh @@ -300,7 +300,6 @@ if [ -z "${DISTRO_INSTALL}" ]; then if [ -z "${DISTRO}" ]; then # Detect if we're running on redhat instead of ubuntu if [ -f /etc/redhat-release ]; then - REDHAT=yes DISTRO="redhat" if ! hash dnf 2>/dev/null; then DISTRO_INSTALL="${REDHAT_INSTALL/dnf/yum}" @@ -311,7 +310,6 @@ if [ -z "${DISTRO_INSTALL}" ]; then DISTRO="synology" DISTRO_INSTALL="synopkg install" else - REDHAT=no DISTRO="debian" DISTRO_INSTALL="${DEBIAN_INSTALL}" fi @@ -427,7 +425,7 @@ INSTALLED_VERSION="$(getPlexVersion)" || warn "Unable to detect installed versio FILE_VERSION="$(parseVersion "${FILENAME}")" verboseOutput INSTALLED_VERSION FILE_VERSION -if [ "${REDHAT}" = "yes" -a "${AUTOINSTALL}" = "yes" -a "${AUTOSTART}" = "no" ]; then +if [ "${DISTRO}" = "redhat" -a "${AUTOINSTALL}" = "yes" -a "${AUTOSTART}" = "no" ]; then warn "Your distribution may require the use of the AUTOSTART [-s] option for the service to start after the upgrade completes." fi @@ -486,7 +484,7 @@ if [ -n "${PLEXSERVER}" -a "${AUTOINSTALL}" = "yes" ]; then fi if [ "${AUTOINSTALL}" = "yes" ]; then - if ! hash ldconfig 2>/dev/null && [ "${REDHAT}" = "no" ]; then + if ! hash ldconfig 2>/dev/null && [ "${DISTRO}" != "redhat" ]; then export PATH=$PATH:/sbin fi @@ -509,7 +507,7 @@ if [ "${AUTODELETE}" = "yes" ]; then fi if [ "${AUTOSTART}" = "yes" ]; then - if [ "${REDHAT}" = "no" ]; then + if [ "${DISTRO}" != "redhat" ]; then warn "The AUTOSTART [-s] option may not be needed on your distribution." fi # Check for systemd