Confirm dialogue added, updated cleanup command

Added a confirm dialogue to the Cleanup Command, and the ability to show how much space was cleared after running the cleanup command.

diff --git a/launcher b/launcher
index 1786a758c1c6b37aee124ea026243b04145d1191..58b0efedaf72db6f138f273c232769002d904072 100755 (executable)
--- a/launcher
+++ b/launcher
@@ -300,12 +300,28 @@ RUBY
 }
 
 [ $command == "cleanup" ] && {
-  echo "Starting Cleanup"
-  docker inspect -f '{{.Id}},{{.State.Running}},{{.State.FinishedAt}}' $(docker ps -qa) | \
-  awk -F, 'BEGIN { TIME=strftime("%FT%T.000000000Z",systime()-60*60*24); } $2=="false" && $3 < TIME {print $1;}' | \
-  xargs --no-run-if-empty docker rm >/dev/null 2>/dev/null
-  docker images --no-trunc| grep none | awk '{print $3}' | xargs -r docker rmi
-  echo "Ending Cleanup"
+  echo
+  echo "The following command will"
+  echo "- Delete all docker images for old containers"
+  echo "- Delete all stopped and orphan containers"
+  echo
+  read -p "Are you sure (Y/n): " -n 1 -r && echo
+  if [[ $REPLY =~ ^[Yy]$ || ! $REPLY ]]
+    then
+      GetSpace=$(du -sk | awk '{print $1}');
+      echo "Starting Cleanup"
+      docker inspect -f '{{.Id}},{{.State.Running}},{{.State.FinishedAt}}' $(docker ps -qa) | \
+      awk -F, 'BEGIN { TIME=strftime("%FT%T.000000000Z",systime()-60*60*24); } $2=="false" && $3 < TIME {print $1;}' | \
+      xargs --no-run-if-empty docker rm >/dev/null 2>/dev/null
+      docker images --no-trunc| grep none | awk '{print $3}' | xargs -r docker rmi
+      let SpaceFreed=$GetSpace-$(du -sk | awk '{print $1}')
+      Output="$SpaceFreed" | awk '{sum=$1;hum[1024**3]="GB"; hum[1024**2]="MB"; hum[1024]="KB"; for (x=1024**3;x>=1024; x/=1024){ if (sum>=x) { printf "%.2f %s\n",sum/x,hum[x];break }}}'
+      [ -z "$Output" ] && { 
+        [[ $SpaceFreed > 0 ]] && { echo "./launcher cleanup cleared up $SpaceFreed Bytes of disk space."; } || { echo "./launcher cleanup has finished, no files were removed."; }
+      } || { echo "./launcher cleanup cleared up $Output of disk space."; }
+    else
+      echo "Aborting..."
+  fi
   exit 0
 }