wip

Author: marcoieni

src/ci/scripts/free-disk-space.sh

@@ -5,26 +5,31 @@
 
 # print a line of the specified character
 printSeparationLine() {
-    for ((i=0; i < 80; i++)); do
-        printf "$1"
+    for ((i = 0; i < 80; i++)); do
+        printf "%s" "$1"
     done
     printf "\n"
 }
 
 # compute available space
 # REF: https://unix.stackexchange.com/a/42049/60849
 # REF: https://stackoverflow.com/a/450821/408734
-getAvailableSpace() { echo $(df -a $1 | awk 'NR > 1 {avail+=$4} END {print avail}'); }
+getAvailableSpace() { echo $(df -a | awk 'NR > 1 {avail+=$4} END {print avail}'); }
 
 # make Kb human readable (assume the input is Kb)
 # REF: https://unix.stackexchange.com/a/44087/60849
 formatByteCount() { echo $(numfmt --to=iec-i --suffix=B --padding=7 $1'000'); }
 
 # macro to output saved space
 printSavedSpace() {
-    local saved=${1}
+    # Disk space before the operation
+    local before=${1}
     local title=${2:-}
 
+    local after
+    after=$(getAvailableSpace)
+    local saved=$((after - before))
+
     echo ""
     printSeparationLine "*"
     if [ -n "${title}" ]; then
@@ -43,33 +48,32 @@ printDF() {
     printSeparationLine "="
     echo "${caption}"
     echo ""
-    echo "$ df -h /"
+    echo "$ df -h"
     echo ""
-    df -h /
+    df -h
     printSeparationLine "="
 }
 
 removeDir() {
     dir=${1}
 
-    local before=$(getAvailableSpace)
+    local before
+    before=$(getAvailableSpace)
 
     sudo rm -rf "$dir" || true
 
-    local after=$(getAvailableSpace)
-    local saved=$((after-before))
-    printSavedSpace $saved "$dir"
+    printSavedSpace "$before" "$dir"
 }
 
 execAndMeasureSpaceChange() {
-    local operation=${1}  # Function to execute
+    local operation=${1} # Function to execute
     local title=${2}
 
-    local before=$(getAvailableSpace)
+    local before
+    before=$(getAvailableSpace)
     $operation
-    local after=$(getAvailableSpace)
-    local saved=$((after-before))
-    printSavedSpace $saved "$title"
+
+    printSavedSpace "$before" "$title"
 }
 
 # Remove large packages
@@ -118,7 +122,6 @@ cleanSwap() {
 # Display initial disk space stats
 
 AVAILABLE_INITIAL=$(getAvailableSpace)
-AVAILABLE_ROOT_INITIAL=$(getAvailableSpace '/')
 
 printDF "BEFORE CLEAN-UP:"
 echo ""
@@ -135,17 +138,10 @@ execAndMeasureSpaceChange cleanDocker "Docker images"
 execAndMeasureSpaceChange cleanSwap "Swap storage"
 
 # Output saved space statistic
-
-AVAILABLE_END=$(getAvailableSpace)
-AVAILABLE_ROOT_END=$(getAvailableSpace '/')
-
 echo ""
 printDF "AFTER CLEAN-UP:"
 
 echo ""
 echo ""
 
-echo "/dev/root:"
-printSavedSpace $((AVAILABLE_ROOT_END - AVAILABLE_ROOT_INITIAL))
-echo "overall:"
-printSavedSpace $((AVAILABLE_END - AVAILABLE_INITIAL))
+printSavedSpace "$AVAILABLE_INITIAL" "Total saved"