From 7d0189a6ecf999b789150bf86a993cc562a75086 Mon Sep 17 00:00:00 2001 From: Yo Chiang Date: Wed, 26 Feb 2020 20:50:46 +0800 Subject: [PATCH] Fix gsi-pubsign-release.sh rsync command MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Add trailing / to rsync source directory, this prevents rsync from creating an additional level of directory under the destination. For example, if `tree src` outputs: src └── file then: $ rsync src dest # creates dest/src/file $ rsync src/ dest # creates dest/file Bug: 149803895 Test: ./gsi-pubsign-release.sh aosp_arm64 aosp_arm64_pubsign \ aosp_arm64-artifact_path aosp_arm64_pubsign-artifact_path Merged-In: I90a80a7afdf6f71db592599c6a645554cf830309 Change-Id: I90a80a7afdf6f71db592599c6a645554cf830309 (cherry picked from commit 8b15a8ba3cbca336a41ec2418553a9e1a5f4b61f) --- gsi/gsi-pubsign-release.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gsi/gsi-pubsign-release.sh b/gsi/gsi-pubsign-release.sh index 72ef05042..653f0f6c4 100755 --- a/gsi/gsi-pubsign-release.sh +++ b/gsi/gsi-pubsign-release.sh @@ -53,7 +53,7 @@ fi # Don't copy logs/ and files whose name starts with $SRC_PRODUCT rsync --verbose --archive --copy-links --exclude='logs' \ - --exclude="${SRC_PRODUCT}-*" "${SRC_DIR}" "${DIST_DIR}" + --exclude="${SRC_PRODUCT}-*" "${SRC_DIR}/" "${DIST_DIR}" # Rename ${SRC_PRODUCT}-xxx.yyy to ${TARGET_PRODUCT}-xxx.yyy for src_path in $(find "${SRC_DIR}" -type f -name "${SRC_PRODUCT}-*") ; do