mirror of
https://github.com/mrworf/plexupdate.git
synced 2025-08-21 13:53:21 -07:00
Make -c only produce output if something is actually done
This commit is contained in:
parent
dab2cf564d
commit
439286ba2e
1 changed files with 22 additions and 3 deletions
|
@ -125,8 +125,9 @@ URL_DOWNLOAD_PUBLIC=https://plex.tv/api/downloads/1.json
|
||||||
|
|
||||||
cronexit() {
|
cronexit() {
|
||||||
# Don't give anything but true error codes if in CRON mode
|
# Don't give anything but true error codes if in CRON mode
|
||||||
|
rawexit=$1
|
||||||
if [ "${CRON}" = "yes" -a $1 -gt 1 -a $1 -lt 255 ]; then
|
if [ "${CRON}" = "yes" -a $1 -gt 1 -a $1 -lt 255 ]; then
|
||||||
cronexit 0
|
exit 0
|
||||||
fi
|
fi
|
||||||
exit $1
|
exit $1
|
||||||
}
|
}
|
||||||
|
@ -203,6 +204,15 @@ if [ ! -z "${RELEASE}" ]; then
|
||||||
cronexit 255
|
cronexit 255
|
||||||
fi
|
fi
|
||||||
|
|
||||||
|
if [ "${CRON}" = "yes" -a "${QUIET}" = "no" ]; then
|
||||||
|
# If running in cron mode, redirect STDOUT to temporary file
|
||||||
|
stdoutlog="$(mktemp)"
|
||||||
|
exec 3>&1 >"${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
|
||||||
|
fi
|
||||||
|
|
||||||
if [ "${AUTOUPDATE}" = "yes" ]; then
|
if [ "${AUTOUPDATE}" = "yes" ]; then
|
||||||
if ! hash git 2>/dev/null; then
|
if ! hash git 2>/dev/null; then
|
||||||
echo "ERROR: You need to have git installed for this to work" >&2
|
echo "ERROR: You need to have git installed for this to work" >&2
|
||||||
|
@ -321,6 +331,11 @@ keypair() {
|
||||||
|
|
||||||
# Setup an cronexit handler so we cleanup
|
# Setup an cronexit handler so we cleanup
|
||||||
function cleanup {
|
function cleanup {
|
||||||
|
if [ "${CRON}" = yes -a "${rawexit}" -ne 5 -a -f "${stdoutlog}" ]; then
|
||||||
|
exec 1>&3
|
||||||
|
cat "${stdoutlog}"
|
||||||
|
fi
|
||||||
|
rm "${stdoutlog}" 2>/dev/null >/dev/null
|
||||||
rm /tmp/postdata 2>/dev/null >/dev/null
|
rm /tmp/postdata 2>/dev/null >/dev/null
|
||||||
rm /tmp/raw 2>/dev/null >/dev/null
|
rm /tmp/raw 2>/dev/null >/dev/null
|
||||||
rm /tmp/failcause 2>/dev/null >/dev/null
|
rm /tmp/failcause 2>/dev/null >/dev/null
|
||||||
|
@ -398,7 +413,11 @@ if [ "${LISTOPTS}" = "yes" ]; then
|
||||||
elif [ -z "$BUILD" ]; then
|
elif [ -z "$BUILD" ]; then
|
||||||
BUILD="$X"
|
BUILD="$X"
|
||||||
else
|
else
|
||||||
printf "%-12s %-30s %s\n" "$DISTRO" "$BUILD" "$X"
|
if [ "${QUIET}" = "yes" ]; then
|
||||||
|
printf "%-12s %-30s %s\n" "$DISTRO" "$BUILD" "$X" >&3
|
||||||
|
else
|
||||||
|
printf "%-12s %-30s %s\n" "$DISTRO" "$BUILD" "$X"
|
||||||
|
fi
|
||||||
BUILD=
|
BUILD=
|
||||||
DISTRO=
|
DISTRO=
|
||||||
fi
|
fi
|
||||||
|
@ -427,7 +446,7 @@ fi
|
||||||
|
|
||||||
if [ "${PRINT_URL}" = "yes" ]; then
|
if [ "${PRINT_URL}" = "yes" ]; then
|
||||||
if [ "${QUIET}" = "yes" ]; then
|
if [ "${QUIET}" = "yes" ]; then
|
||||||
echo "${DOWNLOAD}" >&5
|
echo "${DOWNLOAD}" >&3
|
||||||
else
|
else
|
||||||
echo "${DOWNLOAD}"
|
echo "${DOWNLOAD}"
|
||||||
fi
|
fi
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue