From 03ad32b53132163be42674cd22f3c0e57de8c603 Mon Sep 17 00:00:00 2001 From: Henric Andersson Date: Sun, 20 Nov 2016 19:02:33 -0800 Subject: [PATCH] Revert "Give existing users explaination as to why plexupdate.sh failed" This reverts commit 47a294a4ad15207e4c85bfbbd87e2a955f926c06. --- plexupdate.sh | 11 ++--------- 1 file changed, 2 insertions(+), 9 deletions(-) diff --git a/plexupdate.sh b/plexupdate.sh index 75662c1..a71c562 100755 --- a/plexupdate.sh +++ b/plexupdate.sh @@ -258,15 +258,8 @@ if ! hash wget 2>/dev/null; then fi # If a config file was specified, or if /etc/plexupdate.conf exists, we'll use it. Otherwise, just skip it. -if [ -z "${CONFIGFILE}" ]; then - if [ -f "/etc/plexupdate.conf" ]; then - CONFIGFILE=/etc/plexupdate.conf - else - error "Due to recent changes, config file must be specified or placed in /etc/plexupdate.conf" - exit 1 - fi -fi -source "${CONFIGFILE}" 2>/dev/null + +source "${CONFIGFILE:-"/etc/plexupdate.conf"}" 2>/dev/null # The way I wrote this, it assumes that whatever we put on the command line is what we want and should override # any values in the configuration file. As a result, we need to check if they've been set on the command line