Remove unneded $? evaluation in a -e script

This commit is contained in:
Pau Rodriguez-Estivill
2022-08-20 12:26:52 +02:00
parent 839c096199
commit 6c4d2ce699
+2 -5
View File
@@ -75,15 +75,12 @@ for DB in ${POSTGRES_DBS}; do
WFILE="${BACKUP_DIR}/weekly/${WEEKLY_FILENAME}" WFILE="${BACKUP_DIR}/weekly/${WEEKLY_FILENAME}"
MFILE="${BACKUP_DIR}/monthly/${MONTHY_FILENAME}" MFILE="${BACKUP_DIR}/monthly/${MONTHY_FILENAME}"
#Create dump #Create dump
WEBHOOK=true
if [ "${POSTGRES_CLUSTER}" = "TRUE" ]; then if [ "${POSTGRES_CLUSTER}" = "TRUE" ]; then
echo "Creating cluster dump of ${DB} database from ${POSTGRES_HOST}..." echo "Creating cluster dump of ${DB} database from ${POSTGRES_HOST}..."
pg_dumpall -l "${DB}" ${POSTGRES_EXTRA_OPTS} | gzip > "${FILE}" pg_dumpall -l "${DB}" ${POSTGRES_EXTRA_OPTS} | gzip > "${FILE}"
if [ $? - ne 0 ]; then WEBHOOK=false; fi
else else
echo "Creating dump of ${DB} database from ${POSTGRES_HOST}..." echo "Creating dump of ${DB} database from ${POSTGRES_HOST}..."
pg_dump -d "${DB}" -f "${FILE}" ${POSTGRES_EXTRA_OPTS} pg_dump -d "${DB}" -f "${FILE}" ${POSTGRES_EXTRA_OPTS}
if [ $? - ne 0 ]; then WEBHOOK=false; fi
fi fi
#Copy (hardlink) for each entry #Copy (hardlink) for each entry
if [ -d "${FILE}" ]; then if [ -d "${FILE}" ]; then
@@ -119,10 +116,10 @@ done
echo "SQL backup created successfully" echo "SQL backup created successfully"
if [ "${WEBHOOK_URL}" != "**None**" -a ${WEBHOOK} ]; then if [ "${WEBHOOK_URL}" != "**None**" ]; then
echo "Execute post-backup webhook call to ${WEBHOOK_URL}" echo "Execute post-backup webhook call to ${WEBHOOK_URL}"
curl --request POST \ curl --request POST \
--url ${WEBHOOK_URL} \ --url "${WEBHOOK_URL}" \
--max-time 10 \ --max-time 10 \
--retry 5 \ --retry 5 \
${WEBHOOK_EXTRA_ARGS} ${WEBHOOK_EXTRA_ARGS}