Vecna vor 3 Monaten
Ursprung
Commit
5d9a556a58
1 geänderte Dateien mit 17 neuen und 9 gelöschten Zeilen
  1. 17 9
      scripts/belarus.sh

+ 17 - 9
scripts/belarus.sh

@@ -16,28 +16,36 @@ cd belarus-2020-2021
 if [ "$1" == "--fast" ]; then
     echo "Repacking some pre-processed data for the next step..."
     ./scripts/repack-preprocessed-data.sh
-    #docker exec tp-belarus sh -c "cd /home/analysis/belarus-2020-2021 && ./run.sh --fast" | tee section-3-results
 else
-    #docker run --name "tp-belarus-process-data" --rm -d -i tp-analysis:latest || exit 1
     echo "Downloading data from the Tor Project..."
     ./scripts/download-bridge-data.sh
 
     if [ "$1" == "-s" ]; then
         # Do this step sequentially
         for i in ${months[@]}; do
-            docker run --name "tp-belarus-${i}" --rm -d -i tp-analysis:latest || exit 1
-            docker exec tp-belarus-${i} sh -c "cd /home/analysis/belarus-2020-2021 && ./scripts/extract-extra-infos-archive.sh bridge-extra-infos-${i}.tar.xz"
-            docker cp tp-belarus-${i}:/home/analysis/belarus-2020-2021/data/bridge_data/bridge-extra-infos-${i}_processed.tar.xz . && docker stop tp-belarus-${i}
+            if [ ! -e data/bridge-extra-infos-${i}_processed.tar.xz ]; then
+                docker run --name "tp-belarus-${i}" --rm -d -i tp-analysis:latest || exit 1
+                docker exec tp-belarus-${i} sh -c "mkdir -p /home/analysis/belarus-2020-2021/data"
+                docker cp data/bridge-extra-infos-${i}.tar.xz tp-belarus-${i}:/home/analysis/belarus-2020-2021/data/
+                docker exec tp-belarus-${i} sh -c "cd /home/analysis/belarus-2020-2021 && ./scripts/extract-extra-infos-archive.sh bridge-extra-infos-${i}.tar.xz"
+                docker cp tp-belarus-${i}:/home/analysis/belarus-2020-2021/data/bridge_data/bridge-extra-infos-${i}_processed.tar.xz data/ && docker stop tp-belarus-${i}
+            fi
         done
     else
         # Do this step in parallel
-        for i in ${months[@]}: do
-            docker run --name "tp-belarus-${i}" --rm -d -i tp-analysis:latest || exit 1
-            docker exec tp-belarus-${i} sh -c "cd /home/analysis/belarus-2020-2021 && ./scripts/extract-extra-infos-archive.sh bridge-extra-infos-${i}.tar.xz" &
+        for i in ${months[@]}; do
+            if [ ! -e data/bridge-extra-infos-${i}_processed.tar.xz ]; then
+                docker run --name "tp-belarus-${i}" --rm -d -i tp-analysis:latest || exit 1
+                docker exec tp-belarus-${i} sh -c "mkdir -p /home/analysis/belarus-2020-2021/data"
+                docker cp data/bridge-extra-infos-${i}.tar.xz tp-belarus-${i}:/home/analysis/belarus-2020-2021/data
+                docker exec tp-belarus-${i} sh -c "cd /home/analysis/belarus-2020-2021 && ./scripts/extract-extra-infos-archive.sh bridge-extra-infos-${i}.tar.xz" &
+            fi
         done
         wait
         for i in ${months[@]}; do
-            docker cp tp-belarus-${i}:/home/analysis/belarus-2020-2021/data/bridge_data/bridge-extra-infos-${i}_processed.tar.xz . && docker stop tp-belarus-${i}
+            if [ ! -e data/bridge-extra-infos-${i}_processed.tar.xz ]; then
+                docker cp tp-belarus-${i}:/home/analysis/belarus-2020-2021/data/bridge_data/bridge-extra-infos-${i}_processed.tar.xz data/ && docker stop tp-belarus-${i}
+            fi
         done
     fi
 fi