From b85ba28d2d4c5f8307e9192524d062485e948351 Mon Sep 17 00:00:00 2001
From: Henric Andersson <ha@sensenet.nu>
Date: Mon, 23 Jun 2014 22:00:17 -0700
Subject: [PATCH] Moved config sourcing so it's possible to override all config
 settings (except URL, that should be changed if plex.tv alters again).

---
 plexupdate.sh | 21 +++++++++++----------
 1 file changed, 11 insertions(+), 10 deletions(-)

diff --git a/plexupdate.sh b/plexupdate.sh
index f10fece..2714769 100755
--- a/plexupdate.sh
+++ b/plexupdate.sh
@@ -49,23 +49,24 @@ DOWNLOADDIR="."
 # Don't change anything below this point
 #
 
-# Load settings from config file if it exists
-if [ -f ~/.plexupdate ]; then
-	source ~/.plexupdate
-fi
-
-# Current pages we need
-URL_LOGIN=https://plex.tv/users/sign_in
-URL_DOWNLOAD=https://plex.tv/downloads?channel=plexpass
-URL_DOWNLOAD_PUBLIC=https://plex.tv/downloads
-
 # Defaults
+# (aka "Advanced" settings, can be overriden with config file)
 RELEASE="64-bit"
 KEEP=no
 FORCE=no
 PUBLIC=no
 AUTOINSTALL=no
 
+# Load settings from config file if it exists
+if [ -f ~/.plexupdate ]; then
+	source ~/.plexupdate
+fi
+
+# Current pages we need - Do not change unless Plex.tv changea again
+URL_LOGIN=https://plex.tv/users/sign_in
+URL_DOWNLOAD=https://plex.tv/downloads?channel=plexpass
+URL_DOWNLOAD_PUBLIC=https://plex.tv/downloads
+
 # Parse commandline
 set -- $(getopt fhko: -- "$@")
 while true;