Stop displaying unnecessary errors

Change-Id: I7579c69b110d7a42958543fca4f0145244bedddf

diff --git a/scripts/upgrade-partial.sh b/scripts/upgrade-partial.sh
index 04c6279..1a69ecf 100755 (executable)
--- a/scripts/upgrade-partial.sh
+++ b/scripts/upgrade-partial.sh
@@ -69,10 +69,10 @@ check_args() {
                flog "[Error] Usage: $0 path_to_delta.tar[.gz]"
                exit 1
        fi
-       if /bin/tar ztf "$DOWNLOAD_DELTA" 1>/dev/null; then
+       if /bin/tar ztf "$DOWNLOAD_DELTA" 1>/dev/null 2>&1; then
                DELTA_TAR="$FOTA_DIR/delta.tar.gz"
                DELTA_TAR_GZ="TRUE"
-       elif /bin/tar tf "$DOWNLOAD_DELTA" 1>/dev/null; then
+       elif /bin/tar tf "$DOWNLOAD_DELTA" 1>/dev/null 2>&1; then
                DELTA_TAR="$FOTA_DIR/delta.tar"
        else
                flog "[Error] Usage $0 path_to_delta.tar[.gz]"
@@ -243,7 +243,7 @@ run_setup_script() {
        SETUP_SCRIPT_NAME=setup.sh
        SETUP_SCRIPT_PATH=$FOTA_DIR/$SETUP_SCRIPT_NAME
 
-       /bin/tar xvfp "$DELTA_TAR" -C "$FOTA_DIR" "$SETUP_SCRIPT_NAME" ||\
+       /bin/tar xfp "$DELTA_TAR" -C "$FOTA_DIR" "$SETUP_SCRIPT_NAME" 2>/dev/null ||\
                (flog "[Info] setup.sh does not exist, skipping." && return 0)
 
        if [ -e "$SETUP_SCRIPT_PATH" ]; then

diff --git a/scripts/upgrade-trigger.sh b/scripts/upgrade-trigger.sh
index d8c1fc7..7787430 100755 (executable)
--- a/scripts/upgrade-trigger.sh
+++ b/scripts/upgrade-trigger.sh
@@ -60,10 +60,10 @@ if [ "$#" != "1" ] || [ ! -f "$1" ]; then
        exit 1
 fi
 
-if tar ztf "$DOWNLOAD_DELTA" 1>/dev/null; then
+if tar ztf "$DOWNLOAD_DELTA" 1>/dev/null 2>&1; then
        DELTA_TAR="$FOTA_DIR/delta.tar.gz"
        DELTA_TAR_GZ="TRUE"
-elif tar tf "$DOWNLOAD_DELTA" 1>/dev/null; then
+elif tar tf "$DOWNLOAD_DELTA" 1>/dev/null 2>&1; then
        DELTA_TAR="$FOTA_DIR/delta.tar"
 else
        log "[Error] Usage $0 path_to_delta.tar[.gz]" "$LOG_FILE"
@@ -130,8 +130,8 @@ run_setup_script() {
        SETUP_SCRIPT_NAME=setup.sh
        SETUP_SCRIPT_PATH=$FOTA_DIR/$SETUP_SCRIPT_NAME
 
-       /bin/tar xvfp "$DELTA_TAR" -C "$FOTA_DIR" "$SETUP_SCRIPT_NAME" ||\
-               (log "[Error] setup.sh does not exist, skipping." "$LOG_FILE" && return)
+       /bin/tar xfp "$DELTA_TAR" -C "$FOTA_DIR" "$SETUP_SCRIPT_NAME" 2>/dev/null ||\
+               (log "[Info] setup.sh does not exist, skipping." "$LOG_FILE" && return)
 
        if [ -e "$SETUP_SCRIPT_PATH" ]; then
                /bin/sh "$SETUP_SCRIPT_PATH"