changed rsync to be human readable and delete removed files/folders

alexanderwolz · Dec 17, 2023 · e74fa6c · e74fa6c
1 parent b1d16f1
commit e74fa6c
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 13 deletions.
diff --git a/bin/sync_remote_emulator_images.sh b/bin/sync_remote_emulator_images.sh
@@ -70,18 +70,18 @@ BEGIN=$(date -u +%s)
 mkdir -p $SYSIMG_DIR
 
 #source props missing
-rsync -avP -e "$SSH_OPTS" $REMOTE:$TARGET"/kernel-ranchu" $SYSIMG_DIR"/kernel-ranchu-64" || exit 1
-rsync -avP -e "$SSH_OPTS" $REMOTE:$TARGET"/ramdisk-qemu.img" $SYSIMG_DIR"/ramdisk.img" || exit 1
-rsync -avP -e "$SSH_OPTS" $REMOTE:$TARGET"/system-qemu.img" $SYSIMG_DIR"/system.img" || exit 1
-rsync -avP -e "$SSH_OPTS" $REMOTE:$TARGET"/VerifiedBootParams.textproto" $SYSIMG_DIR"/VerifiedBootParams.textproto" || exit 1
-rsync -avP -e "$SSH_OPTS" $REMOTE:$TARGET"/advancedFeatures.ini" $SYSIMG_DIR"/advancedFeatures.ini" || exit 1
-rsync -avP -e "$SSH_OPTS" $REMOTE:$TARGET"/system/build.prop" $SYSIMG_DIR"/build.prop" || exit 1
-rsync -avP -e "$SSH_OPTS" $REMOTE:$TARGET"/encryptionkey.img" $SYSIMG_DIR"/encryptionkey.img" || exit 1
-rsync -avP -e "$SSH_OPTS" $REMOTE:$TARGET"/userdata.img" $SYSIMG_DIR"/userdata.img" || exit 1
-rsync -avP -e "$SSH_OPTS" $REMOTE:$TARGET"/vendor-qemu.img" $SYSIMG_DIR"/vendor.img" || exit 1
-rsync -avP -e "$SSH_OPTS" $REMOTE:$TARGET"/data" $SYSIMG_DIR || exit 1
-rsync -avP -e "$SSH_OPTS" $REMOTE:$TARGET"/product-qemu.img" $SYSIMG_DIR"/product.img" || exit 1
-rsync -avP -e "$SSH_OPTS" $REMOTE:$TARGET"/system_ext-qemu.img" $SYSIMG_DIR"/system_ext.img" || exit 1
+rsync -avh -e "$SSH_OPTS" --delete $REMOTE:$TARGET"/kernel-ranchu" $SYSIMG_DIR"/kernel-ranchu-64" || exit 1
+rsync -avh -e "$SSH_OPTS" --delete $REMOTE:$TARGET"/ramdisk-qemu.img" $SYSIMG_DIR"/ramdisk.img" || exit 1
+rsync -avh -e "$SSH_OPTS" --delete $REMOTE:$TARGET"/system-qemu.img" $SYSIMG_DIR"/system.img" || exit 1
+rsync -avh -e "$SSH_OPTS" --delete $REMOTE:$TARGET"/VerifiedBootParams.textproto" $SYSIMG_DIR"/VerifiedBootParams.textproto" || exit 1
+rsync -avh -e "$SSH_OPTS" --delete $REMOTE:$TARGET"/advancedFeatures.ini" $SYSIMG_DIR"/advancedFeatures.ini" || exit 1
+rsync -avh -e "$SSH_OPTS" --delete $REMOTE:$TARGET"/system/build.prop" $SYSIMG_DIR"/build.prop" || exit 1
+rsync -avh -e "$SSH_OPTS" --delete $REMOTE:$TARGET"/encryptionkey.img" $SYSIMG_DIR"/encryptionkey.img" || exit 1
+rsync -avh -e "$SSH_OPTS" --delete $REMOTE:$TARGET"/userdata.img" $SYSIMG_DIR"/userdata.img" || exit 1
+rsync -avh -e "$SSH_OPTS" --delete $REMOTE:$TARGET"/vendor-qemu.img" $SYSIMG_DIR"/vendor.img" || exit 1
+rsync -avh -e "$SSH_OPTS" --delete $REMOTE:$TARGET"/data" $SYSIMG_DIR || exit 1
+rsync -avh -e "$SSH_OPTS" --delete $REMOTE:$TARGET"/product-qemu.img" $SYSIMG_DIR"/product.img" || exit 1
+rsync -avh -e "$SSH_OPTS" --delete $REMOTE:$TARGET"/system_ext-qemu.img" $SYSIMG_DIR"/system_ext.img" || exit 1
 
 DURATION=$(($(date -u +%s)-$BEGIN))
 

diff --git a/bin/sync_remote_product_out.sh b/bin/sync_remote_product_out.sh
@@ -52,7 +52,7 @@ REMOTE_PRODUCT_FOLDER="$REMOTE_PRODUCT_PARENT_FOLDER/$DEVICE_NAME"
 
 BEGIN=$(date -u +%s)
 #copy everything from $ANDROID_PRODUCT_OUT except symbols folder
-rsync -aP -e "$SSH_OPTS" --exclude symbols "$SSH_USER@$SSH_HOST":$REMOTE_PRODUCT_FOLDER $LOCAL_AOSP_HOME
+rsync -avh -e "$SSH_OPTS" --delete --exclude symbols "$SSH_USER@$SSH_HOST":$REMOTE_PRODUCT_FOLDER $LOCAL_AOSP_HOME
 DURATION=$(($(date -u +%s)-$BEGIN))
 echo "---------------------------------------------------------------"
 echo "AOSP product can be found at $LOCAL_AOSP_HOME/$DEVICE_NAME"