From 8383048c013bf5f432fea818d147f84b81a4a3b0 Mon Sep 17 00:00:00 2001
From: Alex Malinovich <alexmalinovich@gmail.com>
Date: Sat, 25 Feb 2017 21:39:28 -0800
Subject: [PATCH] Deprecate FORCEALL

---
 plexupdate.sh | 43 +++++++++++++++----------------------------
 1 file changed, 15 insertions(+), 28 deletions(-)

diff --git a/plexupdate.sh b/plexupdate.sh
index 78a06de..70944bb 100755
--- a/plexupdate.sh
+++ b/plexupdate.sh
@@ -58,7 +58,6 @@ PLEXPORT=32400
 # Defaults
 # (aka "Advanced" settings, can be overriden with config file)
 FORCE=no
-FORCEALL=no
 PUBLIC=no
 AUTOINSTALL=no
 AUTODELETE=no
@@ -86,7 +85,6 @@ usage() {
 	echo "    -d Auto delete after auto install"
 	echo "    -f Force download even if it's the same version or file"
 	echo "       already exists unless checksum passes"
-	echo "    -F Force download always"
 	echo "    -h This help"
 	echo "    -l List available builds and distros"
 	echo "    -p Public Plex Media Server version"
@@ -167,7 +165,7 @@ do
 		(-C) error "CRON option is deprecated, please use cronwrapper (see README.md)"; exit 255;;
 		(-d) AUTODELETE=yes;;
 		(-f) FORCE=yes;;
-		(-F) FORCEALL=yes;;
+		(-F) error "FORCEALL/-F option is deprecated, please use FORCE/-f instead"; exit 255;;
 		(-l) LISTOPTS=yes;;
 		(-p) PUBLIC=yes;;
 		(-P) SHOWPROGRESS=yes;;
@@ -220,6 +218,11 @@ if [ "${KEEP}" = "yes" ]; then
 	exit 255
 fi
 
+if [ "${FORCEALL}" = "yes" ]; then
+	error "FORCEALL is deprecated, please use FORCE instead"
+	exit 255
+fi
+
 if [ ! -z "${RELEASE}" ]; then
 	error "RELEASE keyword is deprecated and should be removed from config file"
 	error "Use DISTRO and BUILD instead to manually select what to install (check README.md)"
@@ -442,37 +445,21 @@ if [ "${CHECKONLY}" = "yes" ]; then
 	exit 0
 fi
 
-if [[ $FILENAME == *$INSTALLED_VERSION* ]] && [ "${FORCE}" != "yes" -a "${FORCEALL}" != "yes" ] && [ ! -z "${INSTALLED_VERSION}" ]; then
+if [[ $FILENAME == *$INSTALLED_VERSION* ]] && [ "${FORCE}" != "yes" ] && [ ! -z "${INSTALLED_VERSION}" ]; then
 	info "Your OS reports the latest version of Plex ($INSTALLED_VERSION) is already installed. Use -f to force download."
 	exit 0
 fi
 
-if [ -f "${DOWNLOADDIR}/${FILENAME}" ]; then
-	if [ "${FORCE}" != "yes" -a "${FORCEALL}" != "yes" ]; then
-		sha1sum --status -c "${FILE_SHA}"
-		if [ $? -eq 0 ]; then
-			info "File already exists (${FILENAME}), won't download."
-			if [ "${AUTOINSTALL}" != "yes" ]; then
-				exit 0
-			fi
-			SKIP_DOWNLOAD="yes"
-		else
-			info "File exists but fails checksum. Redownloading."
-			SKIP_DOWNLOAD="no"
+if [ -f "${DOWNLOADDIR}/${FILENAME}" -a "${FORCE}" != "yes" ]; then
+	if sha1sum --status -c "${FILE_SHA}"; then
+		info "File already exists (${FILENAME}), won't download."
+		if [ "${AUTOINSTALL}" != "yes" ]; then
+			exit 0
 		fi
-	elif [ "${FORCEALL}" == "yes" ]; then
-		info "Note! File exists, but asked to overwrite with new copy"
+		SKIP_DOWNLOAD="yes"
 	else
-		sha1sum --status -c "${FILE_SHA}"
-		if [ $? -ne 0 ]; then
-			info "File exists but fails checksum. Redownloading."
-		else
-			info "File exists and checksum passes, won't redownload."
-			if [ "${AUTOINSTALL}" != "yes" ]; then
-				exit 0
-			fi
-			SKIP_DOWNLOAD="yes"
-		fi
+		info "File exists but fails checksum. Redownloading."
+		SKIP_DOWNLOAD="no"
 	fi
 fi