mikes-macos-developer-disk-cleanup 1.0.9 → 1.0.11

package/.env

@@ -5,4 +5,4 @@
 DOTENV_PUBLIC_KEY="036dc3b1c538f3b753f28504685c42364d6aa3fd3cdc0d544ffab9dbe9c8d2afef"
 
 # .env
-GITHUB_TOKEN="encrypted:BNnSFezPjmz67d7bbIftawwuKLB65j8o5QStETBFPmMqZMlWMk0V1qF1NkhYKFvMcnjsv/qIV+1gT/Dkt4IzGZu8bXGhJ6cBfpZJ/QP79YvYGvrn/4qCLj/QsBtsNZc2iCpDJvU7dAzey7gi+2qCCDkZpjv042tsZtTcviAK+JbF31UBqsYTjxSM2FcaXwlbGlQjx6ygDk5AXJbTtQpCa1iAjfeW7ma9MypeKGGfSUBkCDMW42MZmXJZ+TN/Dw=="
+GITHUB_TOKEN="encrypted:BDXSoNLrWFQCQpL2MYnEhmCdGz0TR7znqFIMghNtujL0ADFC5shdKOG/kq7dS1i62whj0gBxZLZYXpg8babGmf9fPM2fBCTxKEgOuSYlRItCYPK4neGRDmonuaj7OOQADGLSw16uHZIb+PnUxQYWk+fkvEA/e53PySLy6H/haK2ld5rFKZLbRjmLk2Rh/JrvWko3DFA5mVQSHqt/gB0m4Rwm/LxTjUAXkeWTBMZP4ZkzGK3v0s87CbqOQN5GOg=="

package/.vscode/settings.json

@@ -9,14 +9,15 @@
         "gradle-shared",
         "hints",
         "homebrew-caches",
+        "infra",
         "library-caches",
         "meteor-builds-and-packages",
         "node-modules",
         "npm-cache",
         "ruby-gems",
+        "*",
         "trash",
         "xcode-artifacts",
         "yarn-cache",
-        "infra"
     ]
 }

package/CHANGELOG.md

@@ -2,9 +2,65 @@
 
 All notable changes to this project will be documented in this file.
 
+## 1.0.11 - 2025-05-14
+
+[v1.0.10...1.0.11](../../compare/v1.0.10...1.0.11)
+
+### :rocket: New features
+
+- :sparkles: add more folders to clear [<sup>(f97bab9)</sup>][f97bab9]
+
+### :bug: Bug fixes
+
+- *(*)* :arrow_up: npm audit fix [<sup>(fe33211)</sup>][fe33211]
+
+### :gear: Miscellaneous Tasks
+
+- :technologist: vscode config: conventional commit scopes [<sup>(58af793)</sup>][58af793]
+
+<!-- LINKS -->
+[f97bab9]:../../commit/f97bab9f8bd42adcdabba32a6c34139874b38b64
+[fe33211]:../../commit/fe33211298811f123e7a5a7189786f668ee9572b
+[58af793]:../../commit/58af793e6a88cf7c756db682548d800eff3ffbae
+
+## 1.0.10 - 2025-03-04
+
+[v1.0.9...1.0.10](../../compare/v1.0.9...1.0.10)
+
+### :rocket: New features
+
+- *(xcode-artifacts)* :sparkles: remove iOS runtimes [<sup>(586155a)</sup>][586155a]
+
+### :bug: Bug fixes
+
+- *(ruby-gems)* :bug: remove dry-run flag [<sup>(5525759)</sup>][5525759]
+- *(android-sdk)* :bug: fix obsolete package delete [<sup>(60c184a)</sup>][60c184a]
+
+### :memo: Documentation
+
+- *(infra)* :memo: fix changelog links [<sup>(a81eb4e)</sup>][a81eb4e]
+
+### :recycle: Refactor
+
+- :recycle: main : separate module loading and execution [<sup>(496b562)</sup>][496b562]
+
+### :gear: Miscellaneous Tasks
+
+- *(infra)* :memo: workaround git-cliff bug [<sup>(21e404c)</sup>][21e404c]
+- *(infra)* :wrench: .env (encrypted): rotate GITHUB_TOKEN [<sup>(2582880)</sup>][2582880]
+
+<!-- LINKS -->
+[21e404c]:../../commit/21e404c3062b38ab03beec99b5a1cd35c54c9a49
+[a81eb4e]:../../commit/a81eb4e5c3830d6b9ae01e07ce8f0a9d90e7b575
+[2582880]:../../commit/2582880f7274c54c021d639f87c748a11996e204
+[5525759]:../../commit/5525759d5fabda664b505f1721ddbf661a3b4ebd
+[60c184a]:../../commit/60c184a8ccde88d9ee3a2e51ca9d8fd01877e03a
+[586155a]:../../commit/586155aa21c63b79bf2f026d41f8ee24038852bd
+[496b562]:../../commit/496b562e97e697ff41f68207b319996d8558c143
+
 ## 1.0.9 - 2025-02-12
 
-[v1.0.8...1.0.9](../../compare/v1.0.8...1.0.9)
+[v1.0.8...v1.0.9](../../compare/v1.0.8...v1.0.9)
 
 ### :memo: Documentation
 
@@ -39,7 +95,6 @@ All notable changes to this project will be documented in this file.
 ### :gear: Miscellaneous Tasks
 
 - :construction_worker: release-it - auto-publish NPM module [<sup>(e452923)</sup>][e452923]
-- Release 1.0.8 [<sup>(6424ffc)</sup>][6424ffc]
 
 <!-- LINKS -->
 [4bfc4a4]:../../commit/4bfc4a4f01631e5a1b6c49e71aefc918251845fc
@@ -50,7 +105,6 @@ All notable changes to this project will be documented in this file.
 [e6620de]:../../commit/e6620deacacfbce8ae0292d208f4a1c2f3117aee
 [7c56838]:../../commit/7c56838eee1fa245bf81b040ac4ee4b17dbca9bb
 [e452923]:../../commit/e452923ade48217127cc9c786a6e12af2eab3829
-[6424ffc]:../../commit/6424ffcda40491db4ff9ef84a8adf38acdb67df1
 
 ## 1.0.7 - 2025-02-05
 
@@ -68,14 +122,12 @@ All notable changes to this project will be documented in this file.
 ### :gear: Miscellaneous Tasks
 
 - :construction_worker: fix changelog generation [<sup>(30f323d)</sup>][30f323d]
-- Release 1.0.7 [<sup>(64546f9)</sup>][64546f9]
 
 <!-- LINKS -->
 [8792d75]:../../commit/8792d759de54c46be3cf3471a7ef3c18f937a41c
 [2aace79]:../../commit/2aace79ab5570049af7bfd87908cbfd4a5f9334f
 [9b28ba2]:../../commit/9b28ba2f4163454a5d36e48af93c3e51509a8b9c
 [30f323d]:../../commit/30f323da067b92b69f912cea5ce85b90997cef44
-[64546f9]:../../commit/64546f9fb87b06d86703311de819256761e2f7ad
 
 ## 1.0.6 - 2024-12-09
 
@@ -85,12 +137,10 @@ All notable changes to this project will be documented in this file.
 
 - :hammer: add GITHUB_TOKEN [<sup>(4d14cbf)</sup>][4d14cbf]
 - :arrow_up: update dependency to node >= 18 [<sup>(ca92511)</sup>][ca92511]
-- Release 1.0.6 [<sup>(88faf33)</sup>][88faf33]
 
 <!-- LINKS -->
 [4d14cbf]:../../commit/4d14cbfae18980d645d60f10a7feef9ce7650b06
 [ca92511]:../../commit/ca925115cb3137e795d55769dfa7332cf38b89cf
-[88faf33]:../../commit/88faf333e35787b53a8988f8a42647e5fde4bfdc
 
 ## 1.0.5 - 2024-12-09
 
@@ -109,7 +159,6 @@ All notable changes to this project will be documented in this file.
 - *(infra)* :hammer: add vscode conventional commit scopes [<sup>(84e7ca5)</sup>][84e7ca5]
 - *(infra)* :hammer: add vscode conventional commit scopes [<sup>(5979eed)</sup>][5979eed]
 - *(infra)* :hammer: add release-it config [<sup>(639b8bb)</sup>][639b8bb]
-- Release 1.0.5 [<sup>(462ee69)</sup>][462ee69]
 
 <!-- LINKS -->
 [6bb0ba6]:../../commit/6bb0ba6fcca63f56f44808eff220eda86579ce85
@@ -117,24 +166,11 @@ All notable changes to this project will be documented in this file.
 [5979eed]:../../commit/5979eed216a65ef6faa733bf71d2a5f47ffb708b
 [639b8bb]:../../commit/639b8bb2122be6c4d7a83267c516636458d1743c
 [12729bd]:../../commit/12729bd019abd9219e6cb3eeda040fc90e836228
-[462ee69]:../../commit/462ee6964edfa65a224b1cc56f1f7cc15fdc600a
 
 ## 1.0.4 - 2024-10-03
 
 [v1.0.3...v1.0.4](../../compare/v1.0.3...v1.0.4)
 
-<!-- LINKS -->
-[bc39b3e]:../../commit/bc39b3e006b19b68acd7deb3b30a8be93b50a52b
-
 ## 1.0.3 - 2024-10-03
 
-
-<!-- LINKS -->
-[9ae79ca]:../../commit/9ae79caa43c647f21aee76bab842286e1b9b10ff
-[1d768b4]:../../commit/1d768b473316daacb557b0cbe8a25ab69f6c7f94
-[c33840f]:../../commit/c33840f3acdee816ec75861bc7d96c9b9497579d
-[dd9c730]:../../commit/dd9c73025a7e2fc9f07766dd76e67a85eafe4c1c
-[5b23c45]:../../commit/5b23c45d8ee2ce2a051a99295c8701e1c747ec8f
-[d44b8c0]:../../commit/d44b8c0a12b30f9b4d8f15f89a1ee80150d147cd
-
 <!-- generated by git-cliff -->

package/cliff.toml

@@ -10,6 +10,7 @@ All notable changes to this project will be documented in this file.\n
 # template for the changelog body
 # https://keats.github.io/tera/docs/#introduction
 body = """\
+{% set orig_version = version %}\
 {% if version %}\
     ## {{ version | trim_start_matches(pat="v") }} - {{ timestamp | date(format="%Y-%m-%d") }}
 {% else %}\
@@ -17,7 +18,7 @@ body = """\
 {% endif %}{% raw %}\n{% endraw %}\
 {% if previous %}\
     {% if previous.version and version %}\
-        [{{ previous.version }}...{{ version }}](../../compare/{{ previous.version }}...{{ version }})
+        [{{ previous.version }}...{{ orig_version }}](../../compare/{{ previous.version }}...{{ orig_version }})
     {% endif %}\
 {% endif %}\
 {% for group, commits in commits | group_by(attribute="group") %}

package/mikes-macos-disk-cleanup.sh

@@ -1,4 +1,4 @@
-#!/usr/bin/env bash -l
+#!/bin/bash
 # ####### Mikes Ultimate Mac OS Developer Disk Cleanup ######
 # @author Mike Cunneen (https://github.com/cunneen)
 # @license MIT
@@ -8,7 +8,7 @@
 # This script will clean up your Mac's disk space. Aggressively.
 # Currently it searches for (and cleans) the following items:
 # - MacOS Trash
-# - MacOS (User) Library Caches
+# - MacOS (User) Library Caches - ALL OF THEM!
 # - meteor package cache (shared between projects)
 # - meteor projects in your development base directory
 # - node_modules folders in your development base directory
@@ -27,6 +27,16 @@
 # - Android AVDs
 # - Homebrew caches
 # - CocoaPods
+# - GoLang cache
+# - Cargo Caches
+# - MediaAnalysisD cache
+# - MobileSMS temp files 
+# - MS Teams temp files 
+# - Messages Previews cache
+# - Log files
+# - VSCode Extensions
+# - Expo caches
+# - ~/.cache
 
 # ==== CONFIGURATION DEFAULTS - change as needed ====
 CONFIGFILE="${HOME}/.config/mikes-macos-disk-cleanup.env" # you'll be prompted to create this if it doesn't exist
@@ -133,58 +143,107 @@ source "${DIR}/modules/hints.sh"
 
 # CocoaPods
 source "${DIR}/modules/cocoapods.sh"
-cocoapods
 
 # remove everything in ~/Library/Caches
 source "${DIR}/modules/library-caches.sh"
-libraryCaches
 
 # remove everything from Trash - this sometimes prompts for confirmation
 source "${DIR}/modules/trash.sh"
-trash
 
 # meteor
 source "${DIR}/modules/meteor-builds-and-packages.sh"
-meteorBuildsAndPackages
 
 # npm cache
 source "${DIR}/modules/npm-cache.sh"
-npmCache
 
 # yarn cache
 source "${DIR}/modules/yarn-cache.sh"
-yarnCache
 
 # bun cache
 source "${DIR}/modules/bun-cache.sh"
-bunCache
 
 # ### XCode ###
 source "${DIR}/modules/xcode-artifacts.sh"
-xcodeArtifacts
 
 # Clear shared gradle caches
 source "${DIR}/modules/gradle-shared.sh"
-gradleShared
 
 # node_modules folders
 source "${DIR}/modules/node-modules.sh"
-nodeModules
 
 # ruby gems
 source "${DIR}/modules/ruby-gems.sh"
-rubyGems
 
 # Docker
 source "${DIR}/modules/docker-files.sh"
-dockerFiles
 
 # Android projects - remove build folders
 source "${DIR}/modules/android-build-folders.sh"
-androidBuildFolders
 
 # Android SDKs
 source "${DIR}/modules/android-sdk.sh"
+
+# Android AVDs
+source "${DIR}/modules/android-avd.sh"
+
+# Homebrew Caches
+source "${DIR}/modules/homebrew-caches.sh"
+
+# Golang Caches
+source "${DIR}/modules/golang-cache.sh"
+
+# Cargo Caches
+source "${DIR}/modules/cargo-cache.sh"
+
+# MediaAnalysisD cache
+source "${DIR}/modules/mediaanalysisd.sh"
+
+# MobileSMS temp files 
+source "${DIR}/modules/mobilesmstmp.sh"
+
+# MS Teams temp files 
+source "${DIR}/modules/msteams.sh"
+
+# Messages Previews cache
+source "${DIR}/modules/messagespreviews.sh"
+
+# Log files
+source "${DIR}/modules/logs.sh"
+
+# VSCode Extensions
+source "${DIR}/modules/vscodeextensions.sh"
+
+# Expo caches
+source "${DIR}/modules/expo.sh"
+
+# ~/.cache
+source "${DIR}/modules/dotcache.sh"
+
+# ======
+# Now run all our modules
+cocoapods
+libraryCaches
+trash
+meteorBuildsAndPackages
+npmCache
+yarnCache
+bunCache
+xcodeArtifacts
+gradleShared
+nodeModules
+rubyGems
+dockerFiles
+goCaches
+cargoCaches
+mediaanalysisd
+mobilesmstmp
+msteams
+messagespreviews
+logs
+vscodeextensions
+expo
+dotcache
+androidBuildFolders
 set +e ; # don't exit on error
 androidSDK
 RETCODE=$?
@@ -199,13 +258,7 @@ if [ ${RETCODE} -ne 0 ]; then
     exit ${RETCODE}
   fi
 fi
-
-# Android AVDs
-source "${DIR}/modules/android-avd.sh"
 androidAVD
-
-# Homebrew Caches
-source "${DIR}/modules/homebrew-caches.sh"
 homebrewCaches
 
 # get the disk usage now that we've run the cleanup

package/modules/android-sdk.awk

@@ -61,39 +61,51 @@ BEGIN{
     } 
     lastPath="";
     lastCat="";
+    processedHeading=0;
     delete itemsToRemove[0]; # initializes a new array
     itemsToRemoveLength=0; # length of array
 }
 /Installed packages:/{
     inInstalled=1;
     inObsolete=0;
+    processedHeading=0;
 }
 /Installed Obsolete Packages:/{
     inInstalled=0;
     inObsolete=1;
+    processedHeading=0;
 }
-/\;/{
-    path=$1; 
-    version=$3;
-    loc=$NF; # last field is location; description has spaces to hard to grab
-    cat=path; 
-    gsub(/;.+$/,"",cat); # the category is just the first portion of the path before the semicolon e.g. "platforms"
-    if (inInstalled) {
-        # If this category is the same as the last one, add the 
-        #  previous record to our list of ones to remove (and keep only the most recent).
-        if (cat == lastCat) {
-            # add the last category as a new item on the end of our array
+$7 ~ /^-------/ { # this is the end of a heading; move to the next line
+    processedHeading=1;
+    next;
+}
+$0 ~ /^.+$/ { # non-empty line
+    if (processedHeading == 1) {
+        path=$1; 
+        version=$3;
+        loc=$NF; # last field is location; description has spaces to hard to grab
+        cat=path; 
+        gsub(/;.+$/,"",cat); # the category is just the first portion of the path before the semicolon e.g. "platforms"
+
+        if (inInstalled) {
+            # If this category is the same as the last one, add the 
+            #  previous record to our list of ones to remove (and keep only the most recent).
+            if (cat == lastCat) {
+                # add the last category as a new item on the end of our array
+                printf("Adding least-recent\"%s\" to itemsToRemove (superceded by \"%s\")\n", lastPath, path);
+                itemsToRemoveLength++;
+                itemsToRemove[itemsToRemoveLength] = lastPath;
+            } else {
+                # we're in a category we haven't yet seen (or the output is not sorted and everything will fall apart)
+            }
+            lastCat = cat;
+            lastPath = path;
+        } else if (inObsolete) {
+            printf("Obsolete: Adding \"%s\" to itemsToRemove\n", path);
+            # we'll just add all obsolete packages to the list of items to remove
             itemsToRemoveLength++;
-            itemsToRemove[itemsToRemoveLength] = lastPath;
-        } else {
-            # we're in a new category
+            itemsToRemove[itemsToRemoveLength] = path;
         }
-        lastCat = cat;
-        lastPath = path;
-    } else if (inObsolete) {
-        # we'll just add all obsolete packages to the list of items to remove
-        itemsToRemoveLength++;
-        itemsToRemove[itemsToRemoveLength] = path;
     }
 }
 END{

package/modules/cargo-cache.sh

@@ -0,0 +1,40 @@
+cargoCaches() {
+    # cargo cache
+    command -v cargo >/dev/null 2>&1 && {
+        if [ -d ${HOME}/.cargo/registry ]; then
+            local CARGO_CACHE_SIZE=$(du -hs ${HOME}/.cargo/registry)
+            echo "=== removing Cargo registry (${CARGO_CACHE_SIZE}) ==="
+            rm -rf ${HOME}/.cargo/registry
+        fi
+
+        # search the development folder for "Cargo.lock" files, and run "cargo clean"
+        #  where we find them
+
+        local CARGO_LOCKFILES=$(
+            find -E "${DEVELOPMENT_BASE_DIR}" -type f -name Cargo.lock \
+                -not -regex "^.*node_modules.+"
+        )
+        echo "  - found cargo lock files; cleaning related 'target' folders..."
+        IFS=$'\n' # make newlines the only separator
+        local MODULESWERE_REMOVED=0
+
+        for CARGO_LOCKFILE in ${CARGO_LOCKFILES}; do
+            MODULESWERE_REMOVED=1
+            local CARGO_FOLDER=$(dirname ${CARGO_LOCKFILE})
+            local TARGET="${CARGO_FOLDER}/target"
+            if [ -d ${TARGET} ]; then
+                local TARGET_SIZE=$(du -hs "${TARGET}" | cut -f1)
+                printf "  - removing '${TARGET}' (${TARGET_SIZE}) ... "
+                rm -rf "${TARGET}"
+                echo "done"
+            fi
+        done
+        unset IFS
+        if [ ${MODULESWERE_REMOVED} -eq 1 ]; then
+            addHint "- You will need to re-run cargo in each of your projects"
+        fi
+    } || {
+	    echo "=== 'cargo' command not found; continuing... ==="
+
+    }
+}

package/modules/docker-files.sh

@@ -5,13 +5,21 @@ dockerFiles() {
         local DOCKER_RUNNING=0;
         docker version && DOCKER_RUNNING=1 || DOCKER_RUNNING=0;
         if [ ! $DOCKER_RUNNING == 1 ]; then
-            echo "======= ERROR: docker daemon not running; skipping docker cleanup ======="
-        else
+
+            echo "        INFO: docker daemon not running; attempting to start docker desktop ..."
+            command docker desktop start >/dev/null 2>&1 && {
+                DOCKER_RUNNING=1
+	    } || {
+                echo "======= ERROR: docker daemon not running and couldn't start; skipping docker cleanup ======="
+            }
+	    fi
+
+        if [ $DOCKER_RUNNING == 1 ]; then
             echo " BEFORE DOCKER CLEANUP:"
             docker system df
             # remove all docker artifacts
             echo "  = removing all docker containers"
-            docker ps -a -q | xargs -r docker rm — force
+            docker ps -a -q | xargs -r docker rm -—force
 
             echo "  = removing all docker images"
             docker image prune --all --force
@@ -31,6 +39,8 @@ dockerFiles() {
             docker system df
 
         fi
+    } || {
+	    echo "=== 'docker' command not found; continuing... ==="
     }
 
 }

package/modules/dotcache.sh

@@ -0,0 +1,8 @@
+dotcache(){
+    local CACHEFOLDER="${HOME}/.cache"
+    if [ -d "${CACHEFOLDER}" ]; then
+        local SIZEBEFORE=$(du -hs "${CACHEFOLDER}" | cut -f1)
+        echo "=== removing ${SIZEBEFORE} of ${CACHEFOLDER} ==="
+        rm -rf "${CACHEFOLDER}"
+    fi
+}

package/modules/expo.sh

@@ -0,0 +1,14 @@
+expo(){
+    local CACHEFOLDER="${HOME}/.expo/ios-simulator-app-cache"
+    if [ -d "${CACHEFOLDER}" ]; then
+        local SIZEBEFORE=$(du -hs "${CACHEFOLDER}" | cut -f1)
+        echo "=== removing ${SIZEBEFORE} of Expo iOS Simulator App caches ==="
+        rm -rf "${CACHEFOLDER}"
+    fi
+    CACHEFOLDER="${HOME}/.expo/android-apk-cache"
+    if [ -d "${CACHEFOLDER}" ]; then
+        local SIZEBEFORE=$(du -hs "${CACHEFOLDER}" | cut -f1)
+        echo "=== removing ${SIZEBEFORE} of Expo Android APK caches ==="
+        rm -rf "${CACHEFOLDER}"
+    fi
+}

package/modules/golang-cache.sh

@@ -0,0 +1,23 @@
+goCaches() {
+    # go cache
+    command -v go >/dev/null 2>&1 && {
+        # Go Build Cache
+        local GOBUILD_CACHE=$(go env GOCACHE);
+        # Go module download cache
+        local GOMOD_CACHE=$(go env GOMODCACHE);
+
+        if [ -d "${GOBUILD_CACHE}" ]; then
+            local GOBUILD_CACHE_SIZE=$(du -hs ${GOBUILD_CACHE});
+            echo "=== removing Go Build Cache (${GOBUILD_CACHE_SIZE}) ==="
+            go clean -cache
+        fi
+
+        if [ -d "${GOMOD_CACHE}" ]; then
+            local GOMOD_CACHE_SIZE=$(du -hs ${GOMOD_CACHE});
+            echo "=== removing Go Module Cache (${GOMOD_CACHE_SIZE}) ==="
+            go clean -modcache
+        fi
+    } || {
+	    echo "=== 'go' command not found; continuing... ==="
+    }
+}

package/modules/homebrew-caches.sh

@@ -25,7 +25,6 @@ homebrewCaches(){
         local SIZEAFTER=$(du -hs ${HOME}/Library/Caches/Homebrew | cut -f1)
         echo "    cache size before: ${SIZEBEFORE}; after: ${SIZEAFTER}"
     } || {
-        echo "brew command not found"
-    	return 1;
+	    echo "=== 'brew' command not found; continuing... ==="
     }
 }

package/modules/library-caches-lsof-output.awk

@@ -0,0 +1,138 @@
+# Usage:
+#   export CACHEPATH=$(realpath $HOME/Library/Caches );
+#   lsof -w -b +c 32 -n | awk -v CACHEPATH=$CACHEPATH -f library-caches-lsof-output.awk
+
+function getProcessNames(retString) {
+  for(proc in processes) {
+    if (proc != ""){
+      retString=retString""sprintf("%s:", proc);
+      # retString=retString""processes[proc];
+      split(processes[proc], theseFolders, ";");
+      for(folder in theseFolders) {
+        if (theseFolders[folder] != "" && (theseFolders[folder] in folderSizes)) {
+          retString=retString""sprintf("%s (%'dKB),", theseFolders[folder], folderSizes[theseFolders[folder]]);
+        }
+      }
+      retString=retString"\n";
+    }
+  }
+  return retString;
+}
+
+function getCacheFoldersByName(retString) {
+  for(cacheFolder in folders) {
+    if (cacheFolder != "" && (cacheFolder in folderSizes)) {
+      retString=retString""sprintf("%s (%'dKB):", cacheFolder, folderSizes[cacheFolder]);
+      retString=retString""folders[cacheFolder];
+      # split(folders[cacheFolder], theseProcesses, ";");
+      # for(proc in theseProcesses) {
+      #   if (theseProcesses[proc] != "") {
+      #     retString=retString""sprintf("%s,", theseProcesses[proc]);
+      #   }
+      # }
+      retString=retString"\n";
+    } 
+  }
+  return retString;
+}
+
+function getCacheFoldersBySize(retString) {
+  for(cacheFolder in folders) {
+    if (cacheFolder != "" && (cacheFolder in folderSizes)) {
+      retString=retString""sprintf("%s (%'dKB)%s:", folderSizes[cacheFolder], folderSizes[cacheFolder], cacheFolder);
+      retString=retString""folders[cacheFolder];
+      # split(folders[cacheFolder], theseProcesses, ";");
+      # for(proc in theseProcesses) {
+      #   if (theseProcesses[proc] != "") {
+      #     retString=retString""sprintf("%s,", theseProcesses[proc]);
+      #   }
+      # }
+      retString=retString"\n";
+    } 
+  }
+  return retString;
+}
+
+
+BEGIN {
+    if (CACHEPATH == "") {
+        CACHEPATH=$HOME"/Library/Caches";
+    } 
+    delete processes[0]; # initializes a new array
+    delete folders[0]; # initializes a new array
+    delete folderSizes[0]; # initializes a new array
+    totalSizesOfFoldersInUse = 0;
+}
+
+($9 ~ CACHEPATH) && 
+!($9 ~ "com.apple.") &&
+!($9 ~ "CloudKit") && 
+!($9 ~ "familycircled") && 
+!($9 ~ "GeoServices") {
+  pathcopy = $9; 
+  gsub(CACHEPATH"/", "", pathcopy); 
+  gsub(/\/.*$/, "", pathcopy);
+  processName = $1;
+  libraryCacheFolder = pathcopy; 
+  # printf("%s\t%s\n", processName, libraryCacheFolder);
+  if (processName in processes) {
+    existingFolderValsString = processes[processName];
+    split(existingFolderValsString, existingFolderValsArray, ";");
+    recorded = 0;
+    for(thisFolderIdx in existingFolderValsArray) {
+      if (existingFolderValsArray[thisFolderIdx] == libraryCacheFolder) {
+        recorded = 1;
+        break;
+      }
+    }
+    if (recorded == 0) {
+      processes[processName] = processes[processName]";"libraryCacheFolder;
+    }
+  } else {
+    if (processName != "" && libraryCacheFolder != "") {
+      processes[processName]=libraryCacheFolder;
+    }
+  }
+  if (libraryCacheFolder in folders) {
+    existingProcessValsString = folders[libraryCacheFolder];
+    split(existingProcessValsString, existingProcessValsArray, ";");
+    recorded = 0;
+    for(thisProcIdx in existingProcessValsArray) {
+      if (existingProcessValsArray[thisProcIdx] == processName) {
+        recorded = 1;
+        break;
+      }
+    }
+    if (recorded == 0) {
+      folders[libraryCacheFolder] = folders[libraryCacheFolder]";"processName
+    }
+  } else {
+    if (processName != "" && libraryCacheFolder != "") {
+      folders[libraryCacheFolder]=processName;
+      # get disk size
+      # -ks : summary in kilobytes; -t 5M : threshold of 5MB
+      # duCmd = "du -n -x -ks -t 5M "CACHEPATH"/"libraryCacheFolder" 2>/dev/null | cut -f1" ;
+      duCmd = "du -n -x -ks "CACHEPATH"/"libraryCacheFolder" 2>/dev/null | cut -f1" ;
+      duCmd | getline duOutput;
+      close(duCmd);
+      folderSizes[libraryCacheFolder] = duOutput;
+      totalSizesOfFoldersInUse += duOutput;
+      # printf("DUCMD: %s\n", duCmd)
+    }
+  }
+}
+END {
+  printf("  --- PROCESSES USING CACHE FILES: ---\n");
+  # printf(getProcessNames()) | "sort";
+  # fflush();
+  # printf("\n");
+  # printf("  --- CACHE FOLDERS IN USE (By NAME): ---\n");
+  # printf(getCacheFoldersByName()) | "sort";
+  # fflush();
+  # printf("\n");
+  printf("  --- CACHE FOLDERS IN USE (By SIZE): ---\n");
+  printf(getCacheFoldersBySize()) | "sort -rn";
+  fflush();
+  printf("\n");
+  printf ("  --- TOTAL SIZE OF FOLDERS IN USE: %s KB\n", totalSizesOfFoldersInUse);
+}

package/modules/library-caches.sh

@@ -1,6 +1,31 @@
 # remove everything in ~/Library/Caches
 libraryCaches() {
-    local LIBRARYCACHESIZE=$((du -hs "${HOME}/Library/Caches" | cut -f1 ) || echo "ERROR: COULD NOT RUN 'du'")
-    echo "=== emptying ~/Library/Caches...(${LIBRARYCACHESIZE}) ==="
-    rm -rf "${HOME}/Library/Caches" || echo "=== ERROR! COULD NOT empty ~/Library/Caches. Continuing. ==="
+    local THISMODULEDIR=$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)
+    local CACHEPATH=$(realpath $HOME/Library/Caches );
+    echo "=== emptying ~/Library/Caches... ==="
+    # # find files in use
+    # lsof -w -b +c 32 -n | \
+    #     awk -v CACHEPATH=$CACHEPATH \
+    #         -f ${THISMODULEDIR}/library-caches-lsof-output.awk
+    
+
+    local LIBRARYCACHESIZE=$((du -hs "${HOME}/Library/Caches" 2>/dev/null | cut -f1 ) || echo "ERROR: COULD NOT RUN 'du'")
+    echo "    Library Caches size: ${LIBRARYCACHESIZE}"
+
+    # now for ~/.cache
+    if [ -d ${HOME}/.cache ]; then
+        CACHEPATH=$(realpath $HOME/.cache )
+        echo "=== emptying ${CACHEPATH}... ==="
+        # find files in use
+        # lsof -w -b +c 32 -n | \
+        #     awk -v CACHEPATH=$CACHEPATH \
+        #         -f ${THISMODULEDIR}/library-caches-lsof-output.awk
+        
+
+        LIBRARYCACHESIZE=$((du -hs "${CACHEPATH}" 2>/dev/null | cut -f1 ) || echo "ERROR: COULD NOT RUN 'du'")
+        echo "    ${CACHEPATH} size: ${LIBRARYCACHESIZE}"
+    fi
+
+    rm -rf "${HOME}/Library/Caches" || echo "=== ERROR! COULD NOT empty ~/Library/Caches. Continuing. ==="    
+    rm -rf "${HOME}/.cache" || echo "=== ERROR! COULD NOT empty ~/.cache. Continuing. ==="    
 }

package/modules/logs.sh

@@ -0,0 +1,8 @@
+logs(){
+    local CACHEFOLDER="${HOME}/Library/Logs"
+    if [ -d "${CACHEFOLDER}" ]; then
+        local SIZEBEFORE=$(du -hs "${CACHEFOLDER}" | cut -f1)
+        echo "=== removing ${SIZEBEFORE} of Logs ==="
+        rm -rf "${CACHEFOLDER}"
+    fi
+}

package/modules/mediaanalysisd.sh

@@ -0,0 +1,8 @@
+mediaanalysisd(){
+    local CACHEFOLDER="${HOME}/Library/Containers/com.apple.mediaanalysisd/Data/Library/Caches"
+    if [ -d "${CACHEFOLDER}" ]; then
+        local SIZEBEFORE=$(du -hs ${HOME}/Library/Containers/com.apple.mediaanalysisd/Data/Library/Caches | cut -f1)
+        echo "=== removing ${SIZEBEFORE} from mediaanalysisd Cache ==="
+        rm -rf "${CACHEFOLDER}"
+    fi
+}

package/modules/messagespreviews.sh

@@ -0,0 +1,9 @@
+messagespreviews(){
+    local CACHEFOLDER="${HOME}/Library/Messages/Caches"
+    if [ -d "${CACHEFOLDER}" ]; then
+
+        local SIZEBEFORE=$(du -hs "${CACHEFOLDER}" | cut -f1)
+        echo "=== removing ${SIZEBEFORE} from Messages Preview cache ==="
+        rm -rf "${CACHEFOLDER}"
+    fi
+}

package/modules/mobilesmstmp.sh

@@ -0,0 +1,8 @@
+mobilesmstmp(){
+    local CACHEFOLDER="${HOME}/Library/Containers/com.apple.MobileSMS/Data/tmp"
+    if [ -d "${CACHEFOLDER}" ]; then
+        local SIZEBEFORE=$(du -hs "${CACHEFOLDER}" | cut -f1)
+        echo "=== removing ${SIZEBEFORE} of MobileSMS temp files ==="
+        rm -rf "${CACHEFOLDER}"
+    fi
+}

package/modules/msteams.sh

@@ -0,0 +1,13 @@
+msteams(){
+    local CACHEFOLDER="${HOME}/Library/Containers/com.microsoft.teams2/Data/Library/Application Support/Microsoft/MSTeams/EBWebView"
+    if [ -d "${CACHEFOLDER}" ]; then
+
+        echo "=== removing MS Teams Caches ==="
+        local SIZEBEFORE=$(du -hs "${CACHEFOLDER}" | cut -f1)
+        echo "    SIZE BEFORE: ${SIZEBEFORE}..."
+        rm -rf "${CACHEFOLDER}/WV2Profile_tfw/Service Worker/CacheStorage"
+        rm -rf "${CACHEFOLDER}/WV2Profile_tfl/Service Worker/CacheStorage"
+        local SIZEAFTER=$(du -hs "${CACHEFOLDER}" | cut -f1)
+        echo "    SIZE AFTER: ${SIZEAFTER}..."
+    fi
+}

package/modules/ruby-gems.sh

@@ -19,7 +19,7 @@ rubyGems() {
             done
             unset IFS
             # remove gems
-            gem cleanup -d
+            gem cleanup
         }
     }
 
@@ -41,8 +41,10 @@ rubyGems() {
 
         unset IFS
         rvm use
+        addHint "- You might need to reinstall your ruby gems"
+        addHint "  - e.g. gem install cocoapods"
+    } || {
+	    echo "=== 'rvm' command not found; continuing... ==="
     }
 
-    addHint "- You might need to reinstall your ruby gems"
-    addHint "  - e.g. gem install cocoapods"
 }

package/modules/vscodeextensions.sh

@@ -0,0 +1,9 @@
+vscodeextensions(){
+    local CACHEFOLDER="${HOME}/.vscode/extensions"
+    if [ -d "${CACHEFOLDER}" ]; then
+        
+        local SIZEBEFORE=$(du -hs "${CACHEFOLDER}" | cut -f1)
+        echo "=== removing $SIZEBEFORE of VSCode extensions ==="
+        rm -rf "${CACHEFOLDER}"
+    fi
+}

package/modules/xcode-artifacts.sh

@@ -1,45 +1,57 @@
 xcodeArtifacts() {
+    local DEVELOPERDIR="${HOME}/Library/Developer"
     # ### XCode ###
-    if [ -d ${HOME}/Library/Developer/Xcode ]; then
+    if [ -d ${DEVELOPERDIR}/Xcode ]; then
         echo "=== clearing Xcode folders ==="
 
         # Xcode DerivedData
-        if [ -d ${HOME}/Library/Developer/Xcode/DerivedData ]; then
-            local XCDDSIZE=$(du -hs ${HOME}/Library/Developer/Xcode/DerivedData | cut -f1)
+        local DERIVEDDATADIR="${DEVELOPERDIR}/Xcode/DerivedData"
+        if [ -d "${DERIVEDDATADIR}" ]; then
+            local XCDDSIZE=$(du -hs "${DERIVEDDATADIR}" | cut -f1)
             echo "   removing Xcode DerivedData(${XCDDSIZE})..."
-            rm -rf ${HOME}/Library/Developer/Xcode/DerivedData
+            rm -rf "${DERIVEDDATADIR}"
         fi
 
         # Xcode DeviceLogs
-        if [ -d ${HOME}/Library/Developer/Xcode/DeviceLogs ]; then
-            local XCDLSIZE=$(du -hs ${HOME}/Library/Developer/Xcode/DeviceLogs | cut -f1)
+        local DEVICELOGDIR="${DEVELOPERDIR}/Xcode/DeviceLogs"
+        if [ -d "${DEVICELOGDIR}" ]; then
+            local XCDLSIZE=$(du -hs "${DEVICELOGDIR}" | cut -f1)
             echo "   removing Xcode DeviceLogs (${XCDLSIZE})..."
-            rm -rf ${HOME}/Library/Developer/Xcode/DeviceLogs
+            rm -rf "${DEVICELOGDIR}"
         fi
 
         # Xcode DeviceLogs
-        if [ -d ${HOME}/Library/Developer/CoreSimulator/Caches ]; then
-            local XCCACHESIZE=$(du -hs ${HOME}/Library/Developer/CoreSimulator/Caches | cut -f1)
+        local SIMULATORCACHEDIR="${DEVELOPERDIR}/CoreSimulator/Caches"
+        if [ -d "${SIMULATORCACHEDIR}" ]; then
+            local XCCACHESIZE=$(du -hs "${SIMULATORCACHEDIR}" | cut -f1)
             echo "   removing Xcode CoreSimulator Caches (${XCCACHESIZE})..."
-            rm -rf ${HOME}/Library/Developer/CoreSimulator/Caches
+            rm -rf "${SIMULATORCACHEDIR}"
         fi
 
         # iOS device support files
-        if [ -d "${HOME}/Library/Developer/Xcode/iOS DeviceSupport" ]; then
+        local DEVICESUPPORTDIR="${DEVELOPERDIR}/Xcode/iOS DeviceSupport"
+        if [ -d "${DEVICESUPPORTDIR}" ]; then
             # display commands to remove iOS device support files (but don't actually remove);
             #   e.g. this would display something like:
             #        - This command would recover 3812 megabytes:
             #            rm -rf "/Users/me/Library/Developer/Xcode/iOS DeviceSupport/iPhone12,8 17.6.1 (21G93)"
             local DEVICESUPPORTCOMMAND=$(
-                du -hs "${HOME}/Library/Developer/Xcode/iOS DeviceSupport/"* |
+                du -hs "${DEVICESUPPORTDIR}"/* |
                     awk '{\
-            r=$0;\
-            gsub(/^[^[:space:]]+[[:space:]]+/,"",r);\
-            printf("- This command would recover an additional %s:\n    rm -rf \"%s\"\n",$1, r);\
-          }'
+                    r=$0;\
+                    gsub(/^[^[:space:]]+[[:space:]]+/,"",r);\
+                    printf("- This command would recover an additional %s:\n    rm -rf \"%s\"\n",$1, r);\
+                  }'
             )
             echo "${DEVICESUPPORTCOMMAND}"
             addHint "${DEVICESUPPORTCOMMAND}"
         fi
+
+        echo "    removing unavailable simulator devices..."
+        xcrun simctl delete unavailable
+
+        echo "    removing all but the most recent iOS simulator runtime..."
+        xcrun simctl runtime list | grep -E '^iOS' | sort -r -n -k 2 | awk 'NR>1{print $5}' | xargs -I{} xcrun simctl runtime delete {}
+
     fi # xcode
 }

package/modules/yarn-cache.sh

@@ -1,9 +1,17 @@
 yarnCache() {
     # yarn cache
     command -v yarn >/dev/null 2>&1 && {
+        yarn set version classic
         local YARNCACHEDIR=$(yarn cache dir)
         local YARNSIZE=$(du -hs ${YARNCACHEDIR} | cut -f1)
-        echo "=== removing yarn cache ${YARNCACHEDIR} (${YARNSIZE}) ==="
+        echo "=== removing yarn 'classic' cache ${YARNCACHEDIR} (${YARNSIZE}) ==="
         yarn cache clean
+        yarn set version berry
+        YARNCACHEDIR=$(yarn config get cacheFolder)
+        YARNSIZE=$(du -hs ${YARNCACHEDIR} | cut -f1)
+        echo "=== removing yarn 'berry' cache ${YARNCACHEDIR} (${YARNSIZE}) ==="
+        yarn cache clean
+    } || {
+	    echo "=== 'yarn' command not found; continuing... ==="
     }
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "mikes-macos-developer-disk-cleanup",
-  "version": "1.0.9",
+  "version": "1.0.11",
   "description": "Cleans up a developer's mac disk space. Aggressively.",
   "bin": {
     "mikes-macos-disk-cleanup": "mikes-macos-disk-cleanup.sh"