diff --git a/Clear.sh b/Clear.sh index cdef57d..8ec64c4 100755 --- a/Clear.sh +++ b/Clear.sh @@ -1,6 +1,6 @@ #!/bin/sh -Version="1.0" +Version="1.1" # Colors # Reset @@ -159,27 +159,21 @@ function deleteOldestInstallFusion360 () { fi } -#clearKeepFolder() { -# # Evals to workaround spaces in arguments -# eval folderPath="$2" -# eval clearableName="$1" - -# echo "${BarColor}====== ${ClearableNameColor}${clearableName} ${BarColor}======${Color_Off}" -# echo "Checking for ${ClearableNameColor}${clearableName}${Color_Off}'s cache folder..." - -# if [ -n "$(ls -d ${folderPath}/* 2>/dev/null)" ]; -# then -# echo "${FoundText}" - -# echo "Clearing ${ClearableNameColor}${clearableName}${Color_Off}'s cache... ${SizeColor}($(du -sh ${folderPath} | cut -f1))${Color_Off}" -# echo ${folderPath} -# cleared=$(($cleared+$(du -sk ${folderPath} | cut -f1))) - -# sudo rm -rvi ${folderPath}/* | pv -l -s $(du -a ${folderPath} | wc -l)> /dev/null -# else -# echo "${ClearableNameColor}${clearableName}${Color_Off}'s cache ${NotFoundColor}not found${Color_Off}." -# fi -#} +clearDocker() { + if docker_exists="$(type -p "docker")" || [[ -z $docker_exists ]]; + then + echo "${BarColor}====== ${ClearableNameColor}Docker ${BarColor}======${Color_Off}" + if [ "$(docker ps -a -q | wc -l)" -gt "0" ]; + then + echo "Found running docker containers, stopping them..." + docker stop $(docker ps -a -q) + docker rm $(docker ps -a -q) + fi + docker system prune --all --force + else + echo "${ClearableNameColor}Docker${Color_Off} was ${NotFoundColor}not found${Color_Off}." + fi +} clearFolder() { # Evals to workaround spaces in arguments @@ -248,6 +242,8 @@ clearFolder "Adobe" "${Adobe}" deleteOldestInstallFusion360 +clearDocker + # Print final echo "${BarColor}==========================================${Color_Off}"