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

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,6 +2,27 @@
 
 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)

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
@@ -179,6 +189,36 @@ 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
@@ -193,6 +233,16 @@ gradleShared
 nodeModules
 rubyGems
 dockerFiles
+goCaches
+cargoCaches
+mediaanalysisd
+mobilesmstmp
+msteams
+messagespreviews
+logs
+vscodeextensions
+expo
+dotcache
 androidBuildFolders
 set +e ; # don't exit on error
 androidSDK

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

@@ -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,42 +1,47 @@
 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}"

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.10",
+  "version": "1.0.11",
   "description": "Cleans up a developer's mac disk space. Aggressively.",
   "bin": {
     "mikes-macos-disk-cleanup": "mikes-macos-disk-cleanup.sh"