From cd6f7067b073dd1f6e047305b557009d8741ffc0 Mon Sep 17 00:00:00 2001
From: z4yx <z4yx@users.noreply.github.com>
Date: Mon, 9 Mar 2020 22:47:38 +0800
Subject: [PATCH] optimize pref. of lxc-images.sh

---
 lxc-images.sh | 14 ++++++--------
 1 file changed, 6 insertions(+), 8 deletions(-)

diff --git a/lxc-images.sh b/lxc-images.sh
index 2f868db..b6d5497 100755
--- a/lxc-images.sh
+++ b/lxc-images.sh
@@ -12,7 +12,7 @@ function sync_lxc_images() {
 	[[ ! -d "$repo_dir" ]] && mkdir -p "$repo_dir"
 	cd "$repo_dir"
 
-	lftp "${repo_url}" -e "mirror --verbose -P 5 --delete --only-newer; bye"
+	lftp "${repo_url}" -e "mirror --verbose -P 5 ; bye"
 	echo "lftp returns $?"
 }
 
@@ -34,20 +34,18 @@ done
 
 echo "=== Downloading images ==="
 
+sync_lxc_images "${BASE_URL}/images" "${TUNASYNC_WORKING_DIR}/images"
+
 images_json="${TUNASYNC_WORKING_DIR}/streams/v1/images.json.work-in-progress"
 [[ -f "$images_json" ]] || exit 1
 jq -r '.products[].versions[].items[].path' "$images_json" > /tmp/filelist.txt
 
-#cut -f 6 -d ';' "${TUNASYNC_WORKING_DIR}/meta/1.0/index-system.work-in-progress"
 cat /tmp/filelist.txt | while read line; do
     # $line looks like 'images/ubuntu/xenial/armhf/default/20200219_07:42/rootfs.tar.xz'
-    dir="$(dirname $line)"
-    if [[ "$dir" = "$last_dir" ]]; then
-        continue
+    if [[ ! -f "${TUNASYNC_WORKING_DIR}/${line}" ]]; then
+        echo "Error: ${TUNASYNC_WORKING_DIR}/${line} vanished"
+        exit 1
     fi
-    last_dir="$dir"
-    echo "=== Syncing $dir ==="
-    sync_lxc_images "${BASE_URL}/${dir}" "${TUNASYNC_WORKING_DIR}/${dir}"
 done
 
 echo "=== Replacing /meta/1.0 ==="