| 1 |
commit: ee193ee9d95da3127d22e7a475e1c8f487e54966 |
| 2 |
Author: Mike Pagano <mpagano <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Wed Sep 15 14:53:39 2021 +0000 |
| 4 |
Commit: Mike Pagano <mpagano <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Wed Sep 15 14:53:39 2021 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/proj/linux-patches.git/commit/?id=ee193ee9 |
| 7 |
|
| 8 |
Add --progress to rsync command |
| 9 |
|
| 10 |
Signed-off-by: Mike Pagano <mpagano <AT> gentoo.org> |
| 11 |
|
| 12 |
scripts/gpdorelease | 2 +- |
| 13 |
scripts/gpdoweb | 10 +++++----- |
| 14 |
2 files changed, 6 insertions(+), 6 deletions(-) |
| 15 |
|
| 16 |
diff --git a/scripts/gpdorelease b/scripts/gpdorelease |
| 17 |
index f57be91..5936489 100755 |
| 18 |
--- a/scripts/gpdorelease |
| 19 |
+++ b/scripts/gpdorelease |
| 20 |
@@ -129,7 +129,7 @@ git push --tags -u origin ${BRANCH} |
| 21 |
# copy files to distfiles-local |
| 22 |
#scp /tmp/${TARBALL_BASENAME}-$newfullver.* ${USERNAME}@dev.gentoo.org:/tmp |
| 23 |
echo "rsycn'in files to dev.gentoo.org:~/public_html/dist/genpatches" |
| 24 |
-rsync /tmp/${TARBALL_BASENAME}-$newfullver.* ${USERNAME}@dev.gentoo.org:~/public_html/dist/genpatches |
| 25 |
+rsync -P /tmp/${TARBALL_BASENAME}-$newfullver.* ${USERNAME}@dev.gentoo.org:~/public_html/dist/genpatches |
| 26 |
|
| 27 |
##if [[ ${DO_WEBSITE} == "yes" ]] ; then |
| 28 |
# mv ${file_base} ${file_extras} ${file_experimental} ${WEB_LOCAL}/tarballs/ |
| 29 |
|
| 30 |
diff --git a/scripts/gpdoweb b/scripts/gpdoweb |
| 31 |
index feb2240..4b06e5b 100755 |
| 32 |
--- a/scripts/gpdoweb |
| 33 |
+++ b/scripts/gpdoweb |
| 34 |
@@ -11,7 +11,7 @@ fi |
| 35 |
|
| 36 |
# send generated htm files for site |
| 37 |
echo "calling rsync command: rsync --exclude=/trunk --exclude=/tarballs --delete -Cavze ssh ${WEB_LOCAL}/output/ ${USERNAME}@${WEB_GENPATCHES_BASE}" |
| 38 |
-rsync --exclude=/trunk --exclude=/tarballs --delete -Cavze ssh \ |
| 39 |
+rsync -P --exclude=/trunk --exclude=/tarballs --delete -Cavze ssh \ |
| 40 |
${WEB_LOCAL}/output/ ${USERNAME}@${WEB_GENPATCHES_BASE} |
| 41 |
|
| 42 |
# delete directory if /tmp/linux-patches exists |
| 43 |
@@ -38,17 +38,17 @@ for BRANCH in $(git -C ${LOCAL_TMP}/linux-patches for-each-ref --format='%(refna |
| 44 |
git -C ${LOCAL_TMP}/linux-patches checkout ${BRANCH} |
| 45 |
|
| 46 |
# copy patches |
| 47 |
- rsync --delete -Cavze ssh ${LOCAL_TMP}/linux-patches/ ${USERNAME}@${WEB_GENPATCHES_BASE}/trunk/$BRANCH |
| 48 |
+ rsync -P --delete -Cavze ssh ${LOCAL_TMP}/linux-patches/ ${USERNAME}@${WEB_GENPATCHES_BASE}/trunk/$BRANCH |
| 49 |
done |
| 50 |
|
| 51 |
# should be easy, copy uploaded files from dev server to tarballs directory locally |
| 52 |
#echo "rsync -avz ${USERNAME}@dev.gentoo.org:/space/distfiles-local/${KERNEL_NAME}* ${WEB_LOCAL}/tarballs/" |
| 53 |
#rsync -avz ${USERNAME}@dev.gentoo.org:/space/distfiles-local/${KERNEL_NAME}* ${WEB_LOCAL}/tarballs/ |
| 54 |
-echo "rsync -avz ${USERNAME}@dev.gentoo.org:~${USERNAME}/public_html/dist/genpatches/${KERNEL_NAME}* ${WEB_LOCAL}/tarballs/" |
| 55 |
-rsync -avz ${USERNAME}@dev.gentoo.org:~${USERNAME}/public_html/dist/genpatches/${KERNEL_NAME}* ${WEB_LOCAL}/tarballs/ |
| 56 |
+echo "rsync -avzP ${USERNAME}@dev.gentoo.org:~${USERNAME}/public_html/dist/genpatches/${KERNEL_NAME}* ${WEB_LOCAL}/tarballs/" |
| 57 |
+rsync -avzP ${USERNAME}@dev.gentoo.org:~${USERNAME}/public_html/dist/genpatches/${KERNEL_NAME}* ${WEB_LOCAL}/tarballs/ |
| 58 |
|
| 59 |
# easy again, copy local tarballs to public_html |
| 60 |
-rsync -Cavze ssh ${WEB_LOCAL}/tarballs/ ${USERNAME}@${WEB_GENPATCHES_BASE}/tarballs |
| 61 |
+rsync -CavzeP ssh ${WEB_LOCAL}/tarballs/ ${USERNAME}@${WEB_GENPATCHES_BASE}/tarballs |
| 62 |
|
| 63 |
# remove linux-patches |
| 64 |
rm -rf ${LOCAL_TMP}/linux-patches |
Archives