Skip to content

Commit 277ded3

Browse files
authored
Merge pull request #6 from AOSC-Dev/pushpkg-fix-the-push-path
pushpkg: fix the push path
2 parents 7b31e4c + 8c14828 commit 277ded3

File tree

1 file changed

+10
-2
lines changed

1 file changed

+10
-2
lines changed

pushpkg/pushpkg

Lines changed: 10 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -64,8 +64,16 @@ OUTPUT_DIR="$(readlink -f debs)"
6464
find "${OUTPUT_DIR}" -maxdepth 1 -type f -delete -print
6565

6666
ssh ${ARGS_SSH} "${USERNAME}@repo.aosc.io" "mkdir -p '/mirror/debs/pool/${BRANCH}/${COMPOMENT}'"
67-
rsync -rlOvhze ssh --progress "${OUTPUT_DIR}"/* "${USERNAME}@repo.aosc.io:/mirror/debs/pool/${BRANCH}/${COMPOMENT}"
67+
68+
pushd "$OUTPUT_DIR"
69+
NOARCH_LIST_PATH="$(mktemp)"
70+
find . -name '*_noarch.deb' -print > "$NOARCH_LIST_PATH"
71+
rsync ${ARGS_RSYNC} -rlOvhze ssh --progress --exclude-from "$NOARCH_LIST_PATH" . "${USERNAME}@repo.aosc.io:/mirror/debs/pool/${BRANCH}/${COMPOMENT}/"
72+
rsync ${ARGS_RSYNC} -rlOvhze ssh --progress --ignore-existing --files-from "$NOARCH_LIST_PATH" . "${USERNAME}@repo.aosc.io:/mirror/debs/pool/${BRANCH}/${COMPOMENT}/"
73+
popd
74+
75+
rm -v "$NOARCH_LIST_PATH" "$NOT_NOARCH_LIST_PATH"
6876

6977
if [ $AFTER_CLEAN_DIRECTORY = 1 ]; then
70-
sudo rm -rv "$(pwd)/debs"
78+
sudo rm -rv "$OUTPUT_DIR"
7179
fi

0 commit comments

Comments
 (0)