scripts cosmetics, updated achive collector

andrew-aladev · Jan 27, 2021 · dd77967 · dd77967
1 parent b2581fc
commit dd77967
Show file tree

Hide file tree

Showing 5 changed files with 15 additions and 9 deletions.
diff --git a/archive-collector b/archive-collector
diff --git a/scripts/coverage_toolchains.sh b/scripts/coverage_toolchains.sh
@@ -59,10 +59,12 @@ while read -r toolchain; do
 
     if ([ -n "$CI" ]); then
       if (echo "$toolchain" | grep -q "clang/coverage.cmake$") && (command -v "llvm-cov" > /dev/null 2>&1); then
-        ./codecov.sh -x "llvm-cov gcov" || continue
+        cov="llvm-cov gcov"
       else
-        ./codecov.sh -x "gcov" || continue
+        cov="gcov"
       fi
+
+      ./codecov.sh -x "$cov" || continue
     fi
 
     some_test_passed=true

diff --git a/scripts/temp/mount.sh b/scripts/temp/mount.sh
@@ -19,7 +19,9 @@ echo "need to mount tmp"
 
 # "sudo" may be required for ramfs.
 if command -v "sudo" > /dev/null 2>&1; then
-  sudo ./ramfs.sh "$TMP_PATH" "$TMP_SIZE" || true
+  sudo_prefix="sudo"
 else
-  ./ramfs.sh "$TMP_PATH" "$TMP_SIZE" || true
+  sudo_prefix=""
 fi
+
+$sudo_prefix ./ramfs.sh "$TMP_PATH" "$TMP_SIZE" || true
diff --git a/scripts/temp/ramfs.sh b/scripts/temp/ramfs.sh
@@ -7,17 +7,17 @@ cd "$DIR"
 TMP_PATH=$1
 TMP_SIZE=$2 # MB
 
+umount -f "$TMP_PATH" || true
+
 kernel_name=$(uname -s)
 
 if [ $kernel_name = "Darwin" ]; then
-  umount -f "$TMP_PATH" || true
   hdiutil detach "$TMP_PATH" || true
 
   sectors=$((2048 * $TMP_SIZE))
   disk_id=$(hdiutil attach -nomount "ram://${sectors}")
   diskutil erasevolume HFS+ "$TMP_PATH" "$disk_id"
 else
-  umount -f "$TMP_PATH" || true
   mount -t ramfs -o size=${TMP_SIZE}M,mode=777 ramfs "$TMP_PATH"
 fi
 

diff --git a/scripts/toolchains.sh b/scripts/toolchains.sh
@@ -74,10 +74,12 @@ while read -r toolchain; do
 
     if ([ "$COVERAGE_TOOLCHAIN" = true ] && [ -n "$CI" ]); then
       if (echo "$toolchain" | grep -q "clang/coverage.cmake$") && (command -v "llvm-cov" > /dev/null 2>&1); then
-        ./codecov.sh -x "llvm-cov gcov" || continue
+        cov="llvm-cov gcov"
       else
-        ./codecov.sh -x "gcov" || continue
+        cov="gcov"
       fi
+
+      ./codecov.sh -x "$cov" || continue
     fi
 
     some_test_passed=true