diff --git a/deploy.sh b/deploy.sh index 00d23a4..e034dc0 100755 --- a/deploy.sh +++ b/deploy.sh @@ -17,12 +17,12 @@ RSYNC_OPTIONS=(--links --safe-links "--info=del,progress2,remove,symsafe") # Should not be changed, these files need to be synced in order for repo-add to work properly REPO_FILES=("${REPO_NAME}".db.tar.gz "${REPO_NAME}".db.tar.gz.sig "${REPO_NAME}".files.tar.gz "${REPO_NAME}".files.tar.gz.sig - "${REPO_NAME}".db 0 "${REPO_NAME}".db.sig "${REPO_NAME}".files "${REPO_NAME}".files.sig) + "${REPO_NAME}".db "${REPO_NAME}".db.sig "${REPO_NAME}".files "${REPO_NAME}".files.sig) # Start script -mapfile -t packages < <(ls ./*pkg.tar.zst$) -mapfile -t sigs < <(ls ./*pkg.tar.zst.sig$) +mapfile -t packages < <(ls ./*pkg.tar.zst) +mapfile -t sigs < <(ls ./*pkg.tar.zst.sig) mkdir -p $TMP_REPO_ROOT @@ -36,13 +36,13 @@ remote_files=() for f in "${REPO_FILES[@]}"; do remote_files+=("${REMOTE_REPO_ROOT}/$f") done -rsync "${RSYNC_OPTIONS[@]}" "${remote_files[@]}" "${TMP_REPO_ROOT}" +rsync --ignore-missing-args "${RSYNC_OPTIONS[@]}" "${remote_files[@]}" "${TMP_REPO_ROOT}" # update repo locally echo "[deploy] Updating repository locally" cp "${packages[@]}" "${TMP_REPO_ROOT}" cp "${sigs[@]}" "${TMP_REPO_ROOT}" -repo-add --new --remove --verify --sign ${TMP_REPO_ROOT}/mkessler-arch.db.tar.gz "${packages[*]}" +repo-add --new --remove --verify --sign "${TMP_REPO_ROOT}/${REPO_NAME}.db.tar.gz" "${packages[*]}" # sync repo to remote echo "[deploy] Syncing changes to remote"