From 5747ef78cbd646bec38dc5d6c52d2461b428daa2 Mon Sep 17 00:00:00 2001 From: Jon Date: Fri, 30 Sep 2016 00:25:07 -0400 Subject: [PATCH] Convert tmp files to mktemp (#110) * Convert tmp files to mktemp * Prepend variables with FILE_ * Rename SHAFILE --- plexupdate.sh | 70 +++++++++++++++++++++++++-------------------------- 1 file changed, 35 insertions(+), 35 deletions(-) diff --git a/plexupdate.sh b/plexupdate.sh index fa45e36..8ec8dca 100755 --- a/plexupdate.sh +++ b/plexupdate.sh @@ -67,6 +67,13 @@ REDHAT_INSTALL="yum -y install" DEBIAN_INSTALL="dpkg -i" DISTRO_INSTALL="" +FILE_STDOUTLOG=$(mktemp /tmp/plexupdate.log.XXXX) +FILE_POSTDATA=$(mktemp /tmp/plexupdate.postdata.XXXX) +FILE_RAW=$(mktemp /tmp/plexupdate.raw.XXXX) +FILE_FAILCAUSE=$(mktemp /tmp/plexupdate.failcause.XXXX) +FILE_KAKA=$(mktemp /tmp/plexupdate.kaka.XXXX) +FILE_SHA=$(mktemp /tmp/plexupdate.sha.XXXX) + # Sanity, make sure wget is in our path... if ! hash wget 2>/dev/null; then echo "ERROR: This script requires wget in the path. It could also signify that you don't have the tool installed." >&2 @@ -239,8 +246,7 @@ fi if [ "${CRON}" = "yes" -a "${QUIET}" = "no" ]; then # If running in cron mode, redirect STDOUT to temporary file - STDOUTLOG="$(mktemp)" - exec 3>&1 >"${STDOUTLOG}" + exec 3>&1 >"${FILE_STDOUTLOG}" elif [ "${QUIET}" = "yes" ]; then # Redirect STDOUT to dev null. Use >&3 if you really, really, REALLY need to print to STDOUT exec 3>&1 > /dev/null @@ -284,7 +290,7 @@ if [ "${AUTOUPDATE}" = "yes" ]; then fi # Sanity check -if [ -z "${EMAIL}" -o -z "${PASS}" ] && [ "${PUBLIC}" = "no" ] && [ ! -f /tmp/kaka ]; then +if [ -z "${EMAIL}" -o -z "${PASS}" ] && [ "${PUBLIC}" = "no" ] && [ ! -f "${FILE_KAKA}" ]; then echo "ERROR: Need username & password to download PlexPass version. Otherwise run with -p to download public version." >&2 cronexit 1 fi @@ -356,16 +362,15 @@ keypair() { # Setup an cronexit handler so we cleanup function cleanup { - if [ "${CRON}" = yes -a "${RAWEXIT}" -ne 5 -a -f "${STDOUTLOG}" ]; then + if [ "${CRON}" = yes -a "${RAWEXIT}" -ne 5 -a -f "${FILE_STDOUTLOG}" ]; then exec 1>&3 - cat "${STDOUTLOG}" + cat "${FILE_STDOUTLOG}" fi - rm "${STDOUTLOG}" 2>/dev/null >/dev/null - rm /tmp/postdata 2>/dev/null >/dev/null - rm /tmp/raw 2>/dev/null >/dev/null - rm /tmp/failcause 2>/dev/null >/dev/null - rm /tmp/kaka 2>/dev/null >/dev/null - rm "/tmp/package.sha" 2>/dev/null >/dev/null + rm "${FILE_POSTDATA}" 2>/dev/null >/dev/null + rm "${FILE_RAW}" 2>/dev/null >/dev/null + rm "${FILE_FAILCAUSE}" 2>/dev/null >/dev/null + rm "${FILE_KAKA}" 2>/dev/null >/dev/null + rm "${FILE_SHA}" 2>/dev/null >/dev/null } trap cleanup EXIT @@ -379,55 +384,50 @@ trap cleanup EXIT # user[remember_me] 0 # commit Sign in -# Load previous token if stored -if [ -f /tmp/kaka_token ]; then - TOKEN=$(cat /tmp/kaka_token) -fi - if [ "${PUBLIC}" = "no" ]; then echo -n "Authenticating..." # Clean old session - rm /tmp/kaka 2>/dev/null + rm "${FILE_KAKA}" 2>/dev/null # Build post data - echo -ne >/tmp/postdata "$(keypair "user[login]" "${EMAIL}" )" - echo -ne >>/tmp/postdata "&$(keypair "user[password]" "${PASS}" )" - echo -ne >>/tmp/postdata "&$(keypair "user[remember_me]" "0" )" + echo -ne >"${FILE_POSTDATA}" "$(keypair "user[login]" "${EMAIL}" )" + echo -ne >>"${FILE_POSTDATA}" "&$(keypair "user[password]" "${PASS}" )" + echo -ne >>"${FILE_POSTDATA}" "&$(keypair "user[remember_me]" "0" )" # Authenticate (using Plex Single Sign On) - wget --header "X-Plex-Client-Identifier: 4a745ae7-1839-e44e-1e42-aebfa578c865" --header "X-Plex-Product: Plex SSO" --load-cookies /tmp/kaka --save-cookies /tmp/kaka --keep-session-cookies "${URL_LOGIN}" --post-file=/tmp/postdata -q -S -O /tmp/failcause 2>/tmp/raw + wget --header "X-Plex-Client-Identifier: 4a745ae7-1839-e44e-1e42-aebfa578c865" --header "X-Plex-Product: Plex SSO" --load-cookies "${FILE_KAKA}" --save-cookies "${FILE_KAKA}" --keep-session-cookies "${URL_LOGIN}" --post-file="${FILE_POSTDATA}" -q -S -O "${FILE_FAILCAUSE}" 2>"${FILE_RAW}" # Delete authentication data ... Bad idea to let that stick around - rm /tmp/postdata + rm "${FILE_POSTDATA}" # Provide some details to the end user - RESULTCODE=$(head -n1 /tmp/raw | grep -oe '[1-5][0-9][0-9]') + RESULTCODE=$(head -n1 "${FILE_RAW}" | grep -oe '[1-5][0-9][0-9]') if [ $RESULTCODE -eq 401 ]; then echo "ERROR: Username and/or password incorrect" >&2 cronexit 1 elif [ $RESULTCODE -ne 201 ]; then echo "ERROR: Failed to login, debug information:" >&2 - cat /tmp/failcause >&2 + cat "${FILE_FAILCAUSE}" >&2 cronexit 1 fi # If the system got here, it means the login was successfull, so we set the TOKEN variable to the authToken from the response # I use cut -c 14- to cut off the "authToken":" string from the grepped result, can probably be done in a different way - TOKEN=$(/dev/null >/dev/null /tmp/kaka - touch /tmp/kaka + rm 2>/dev/null >/dev/null "${FILE_KAKA}" + touch "${FILE_KAKA}" URL_DOWNLOAD=${URL_DOWNLOAD_PUBLIC} fi if [ "${LISTOPTS}" = "yes" ]; then - opts="$(wget --load-cookies /tmp/kaka --save-cookies /tmp/kaka --keep-session-cookies "${URL_DOWNLOAD}" -O - 2>/dev/null | grep -oe '"label"[^}]*' | grep -v Download | sed 's/"label":"\([^"]*\)","build":"\([^"]*\)","distro":"\([^"]*\)".*/"\3" "\2" "\1"/' | uniq | sort)" + opts="$(wget --load-cookies "${FILE_KAKA}" --save-cookies "${FILE_KAKA}" --keep-session-cookies "${URL_DOWNLOAD}" -O - 2>/dev/null | grep -oe '"label"[^}]*' | grep -v Download | sed 's/"label":"\([^"]*\)","build":"\([^"]*\)","distro":"\([^"]*\)".*/"\3" "\2" "\1"/' | uniq | sort)" eval opts=( "DISTRO" "BUILD" "DESCRIPTION" "======" "=====" "==============================================" $opts ) BUILD= @@ -455,7 +455,7 @@ fi echo -n "Finding download URL to download..." # Set "X-Plex-Token" to the auth token, if no token is specified or it is invalid, the list will return public downloads by default -RELEASE=$(wget --header "X-Plex-Token:"${TOKEN}"" --load-cookies /tmp/kaka --save-cookies /tmp/kaka --keep-session-cookies "${URL_DOWNLOAD}" -O - 2>/dev/null | grep -ioe '"label"[^}]*' | grep -i "\"distro\":\"${DISTRO}\"" | grep -m1 -i "\"build\":\"${BUILD}\"") +RELEASE=$(wget --header "X-Plex-Token:"${TOKEN}"" --load-cookies "${FILE_KAKA}" --save-cookies "${FILE_KAKA}" --keep-session-cookies "${URL_DOWNLOAD}" -O - 2>/dev/null | grep -ioe '"label"[^}]*' | grep -i "\"distro\":\"${DISTRO}\"" | grep -m1 -i "\"build\":\"${BUILD}\"") DOWNLOAD=$(echo ${RELEASE} | grep -m1 -ioe 'https://[^\"]*') CHECKSUM=$(echo ${RELEASE} | grep -ioe '\"checksum\"\:\"[^\"]*' | sed 's/\"checksum\"\:\"//') echo "OK" @@ -471,7 +471,7 @@ if [ $? -ne 0 ]; then cronexit 3 fi -echo "${CHECKSUM} ${DOWNLOADDIR}/${FILENAME}" >"/tmp/package.sha" +echo "${CHECKSUM} ${DOWNLOADDIR}/${FILENAME}" >"${FILE_SHA}" if [ "${PRINT_URL}" = "yes" ]; then if [ "${QUIET}" = "yes" ]; then @@ -502,7 +502,7 @@ fi if [ -f "${DOWNLOADDIR}/${FILENAME}" ]; then if [ "${FORCE}" != "yes" -a "${FORCEALL}" != "yes" ]; then - sha1sum --status -c "/tmp/package.sha" + sha1sum --status -c "${FILE_SHA}" if [ $? -eq 0 ]; then echo "File already exists (${FILENAME}), won't download." if [ "${AUTOINSTALL}" != "yes" ]; then @@ -516,7 +516,7 @@ if [ -f "${DOWNLOADDIR}/${FILENAME}" ]; then elif [ "${FORCEALL}" == "yes" ]; then echo "Note! File exists, but asked to overwrite with new copy" else - sha1sum --status -c "/tmp/package.sha" + sha1sum --status -c "${FILE_SHA}" if [ $? -ne 0 ]; then echo "Note! File exists but fails checksum. Redownloading." else @@ -531,7 +531,7 @@ fi if [ "${SKIP_DOWNLOAD}" = "no" ]; then echo -ne "Downloading release \"${FILENAME}\"..." - ERROR=$(wget --load-cookies /tmp/kaka --save-cookies /tmp/kaka --keep-session-cookies "${DOWNLOAD}" -O "${DOWNLOADDIR}/${FILENAME}" 2>&1) + ERROR=$(wget --load-cookies "${FILE_KAKA}" --save-cookies "${FILE_KAKA}" --keep-session-cookies "${DOWNLOAD}" -O "${DOWNLOADDIR}/${FILENAME}" 2>&1) CODE=$? if [ ${CODE} -ne 0 ]; then echo -e "\n !! Download failed with code ${CODE}, \"${ERROR}\"" @@ -540,7 +540,7 @@ if [ "${SKIP_DOWNLOAD}" = "no" ]; then echo "OK" fi -sha1sum --status -c "/tmp/package.sha" +sha1sum --status -c "${FILE_SHA}" if [ $? -ne 0 ]; then echo "Downloaded file corrupt. Try again." cronexit 4