Skip to content

Commit 6bb784c

Browse files
authored
refs #000: restore rclone command output (#17)
1 parent 1018438 commit 6bb784c

File tree

3 files changed

+11
-11
lines changed

3 files changed

+11
-11
lines changed

app/commands/bucket/subcommands/copy-bucket.sh

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -48,11 +48,11 @@ echo "$(format_string "ACL:" "bold") ${ACL}"
4848

4949
if [ "${PROVIDER_LOWER}" = "aws" ]; then
5050
echo "rclone_aws sync :s3://${BUCKET_SRC}/${FILE_SRC} :s3://${BUCKET_DST}/${FILE_DST}"
51-
rclone_aws sync :s3://${BUCKET_SRC}/${FILE_SRC} :s3://${BUCKET_DST}/${FILE_DST} 2> /dev/null
51+
rclone_aws sync :s3://${BUCKET_SRC}/${FILE_SRC} :s3://${BUCKET_DST}/${FILE_DST}
5252
EXIT_RCLONE=$?
5353
elif [ "${PROVIDER_LOWER}" = "gcs" ]; then
5454
echo "rclone_gcs sync :gcs://${BUCKET_SRC}/${FILE_SRC} :gcs://${BUCKET_SRC}/${FILE_DST}"
55-
rclone_gcs sync :gcs://${BUCKET_SRC}/${FILE_SRC} :gcs://${BUCKET_SRC}/${FILE_DST} 2> /dev/null
55+
rclone_gcs sync :gcs://${BUCKET_SRC}/${FILE_SRC} :gcs://${BUCKET_SRC}/${FILE_DST}
5656
EXIT_RCLONE=$?
5757
elif [ "${PROVIDER_LOWER}" = "minio" ]; then
5858
# Wait for source minio service
@@ -85,7 +85,7 @@ elif [ "${PROVIDER_LOWER}" = "minio" ]; then
8585

8686
debug "Wait for source minio service files (timeout ${TIMEOUT_BUCKET_SRC} seconds)."
8787
while [ ${EXIT_LS} -ne 0 ]; do
88-
rclone_minio_multi ls src://${BUCKET_SRC}/${FILE_SRC} 1> /dev/null 2>&1
88+
rclone_minio_multi ls src://${BUCKET_SRC}/${FILE_SRC} 1> /dev/null
8989
EXIT_LS=$?
9090

9191
debug "Check for loop ${LOOP_CNT} fail"
@@ -99,7 +99,7 @@ elif [ "${PROVIDER_LOWER}" = "minio" ]; then
9999
done
100100

101101
echo "rclone_minio_multi sync src://${BUCKET_SRC}/${FILE_SRC} dst://${BUCKET_DST}/${FILE_DST}"
102-
rclone_minio_multi sync src://${BUCKET_SRC}/${FILE_SRC} dst://${BUCKET_DST}/${FILE_DST} 2> /dev/null
102+
rclone_minio_multi sync src://${BUCKET_SRC}/${FILE_SRC} dst://${BUCKET_DST}/${FILE_DST}
103103
EXIT_RCLONE=$?
104104
fi
105105

app/commands/mysql/subcommands/export-to-bucket.sh

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -111,7 +111,7 @@ if [ "${PROVIDER_LOWER}" = "aws" ]; then
111111
EXIT_RCLONE=$?
112112
elif [ "${PROVIDER_LOWER}" = "gcs" ]; then
113113
echo "rclone_gcs copy \"${DST_DIR}/${LOCAL_FILE}\" :s3://${BUCKET}/${REMOTE_DIR}"
114-
rclone_gcs copy "${DST_DIR}/${LOCAL_FILE}" :gcs://${BUCKET}/${REMOTE_DIR} 2> /dev/null
114+
rclone_gcs copy "${DST_DIR}/${LOCAL_FILE}" :gcs://${BUCKET}/${REMOTE_DIR}
115115
EXIT_RCLONE=$?
116116
elif [ "${PROVIDER_LOWER}" = "minio" ]; then
117117
# Wait for minio service
@@ -133,7 +133,7 @@ elif [ "${PROVIDER_LOWER}" = "minio" ]; then
133133
debug "Wait for minio service (timeout ${TIMEOUT_BUCKET} seconds)."
134134
while [ ${EXIT_LS} -ne 0 ]; do
135135
debug "rclone_minio ls :s3://${BUCKET}/"
136-
rclone_minio ls :s3://${BUCKET}/ 1> /dev/null 2>&1
136+
rclone_minio ls :s3://${BUCKET}/ 1> /dev/null
137137
EXIT_LS=$?
138138

139139
debug "Check for loop ${LOOP_CNT} fail"
@@ -147,7 +147,7 @@ elif [ "${PROVIDER_LOWER}" = "minio" ]; then
147147
done
148148

149149
echo "rclone_minio copy \"${DST_DIR}/${LOCAL_FILE}\" :s3://${BUCKET}/${REMOTE_DIR}"
150-
rclone_minio copy "${DST_DIR}/${LOCAL_FILE}" :s3://${BUCKET}/${REMOTE_DIR} 2> /dev/null
150+
rclone_minio copy "${DST_DIR}/${LOCAL_FILE}" :s3://${BUCKET}/${REMOTE_DIR}
151151
EXIT_RCLONE=$?
152152
fi
153153

app/commands/mysql/subcommands/import-from-bucket.sh

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -64,10 +64,10 @@ echo "Download the file from the bucket."
6464

6565
if [ "${PROVIDER_LOWER}" = "aws" ]; then
6666
echo "rclone_aws copy :s3://${BUCKET}/${FILE} \"${DST_DIR}\""
67-
rclone_aws copy :s3://${BUCKET}/${FILE} "${DST_DIR}" 2> /dev/null
67+
rclone_aws copy :s3://${BUCKET}/${FILE} "${DST_DIR}"
6868
elif [ "${PROVIDER_LOWER}" = "gcs" ]; then
6969
echo "rclone_gcs copy :gcs://${BUCKET}/${FILE} \"${DST_DIR}\""
70-
rclone_gcs copy :gcs://${BUCKET}/${FILE} "${DST_DIR}" 2> /dev/null
70+
rclone_gcs copy :gcs://${BUCKET}/${FILE} "${DST_DIR}"
7171
elif [ "${PROVIDER_LOWER}" = "minio" ]; then
7272
# Wait for minio service
7373
WAIT_ENDPOINT=$(remove_http_proto "${BUCKET_ENDPOINT}")
@@ -88,7 +88,7 @@ elif [ "${PROVIDER_LOWER}" = "minio" ]; then
8888
debug "Wait for minio service (timeout ${TIMEOUT_BUCKET} seconds)."
8989
while [ ${EXIT_LS} -ne 0 ]; do
9090
debug "rclone_minio ls :s3://${BUCKET}/${FILE}"
91-
rclone_minio ls :s3://${BUCKET}/${FILE} 1> /dev/null 2>&1
91+
rclone_minio ls :s3://${BUCKET}/${FILE} 1> /dev/null
9292
EXIT_LS=$?
9393

9494
debug "Check for loop ${LOOP_CNT} fail"
@@ -102,7 +102,7 @@ elif [ "${PROVIDER_LOWER}" = "minio" ]; then
102102
done
103103

104104
echo "rclone_minio copy :s3://${BUCKET}/${FILE} \"${DST_DIR}\""
105-
rclone_minio copy :s3://${BUCKET}/${FILE} "${DST_DIR}" 2> /dev/null
105+
rclone_minio copy :s3://${BUCKET}/${FILE} "${DST_DIR}"
106106
fi
107107

108108
LOCAL_FILE=$(basename "${FILE}")

0 commit comments

Comments
 (0)