Make plexupdate-core available earlier in installer.sh

extras/installer.sh

@@ -16,6 +16,19 @@ PUBLIC=
 CONFIGVARS="AUTOINSTALL AUTODELETE DOWNLOADDIR TOKEN FORCE FORCEALL PUBLIC AUTOSTART AUTOUPDATE PLEXSERVER PLEXPORT CHECKUPDATE NOTIFY"
 CRONVARS="CONF SCRIPT LOGGING"
 
+if [ "$0" = "installer.sh" ]; then
+	source "$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )/plexupdate-core"
+else
+	if hash wget 2>/dev/null; then
+		DOWNLOADER="wget -qO -"
+	elif hash curl 2>/dev/null; then
+		DOWNLOADER="curl -fsSL"
+	fi
+	# there is no 'else' because if this is being run plexupdate is either already installed
+	# or they already have either wget or curl
+	source <($DOWNLOADER "${ORIGIN_REPO}/${BRANCHNAME:-master}/plexupdate-core")
+fi
+
 install() {
 	echo "'$req' is required but not installed, attempting to install..."
 	sleep 1
@@ -95,11 +108,6 @@ noyes() {
 	yesno N
 }
 
-abort() {
-	echo "$@"
-	exit 1
-}
-
 install_plexupdate() {
 	echo
 	read -e -p "Directory to install into: " -i "/opt/plexupdate" FULL_PATH
@@ -343,8 +351,6 @@ else
 	install_plexupdate
 fi
 
-source "${FULL_PATH}/plexupdate-core"
-
 configure_plexupdate
 configure_cron
 

plexupdate-core

@@ -5,7 +5,7 @@
 # GPW -> getPlexWebToken
 # HELPERS -> keypair, rawurlencode, trimQuotes
 # RNNG -> running
-# SHARED -> warn, info, warn
+# SHARED -> warn, info, error, abort
 
 ######## CONSTANTS ########
 # Current pages we need - Do not change unless Plex.tv changes again
@@ -272,8 +272,13 @@ error() {
 	echo "ERROR: $@" >&2
 }
 
+abort() {
+	echo "$@" >&2
+	exit 1
+}
+
 # Intentionally leaving this hard to find so that people aren't trying to use it manually.
 if [ "$(basename "$0")" = "get-plex-token" ]; then
 	[ -f /etc/plexupdate.conf ] && source /etc/plexupdate.conf
-	getPlexToken && info "Token = $TOKEN"
+	getPlexToken && info "TOKEN=$TOKEN"
 fi