mikes-macos-developer-disk-cleanup 1.0.1 → 1.0.4

package/README.md

@@ -31,10 +31,8 @@ Currently it searches for (and cleans) the following items:
 
 ## How to Use the Script
 
-1. Clone this repository: `git clone https://github.com/cunneen/mikes-macos-developer-disk-cleanup.git cleanup`
-2. Navigate to the directory where the script is located using the `cd` command: `cd cleanup`
-3. Run the script by typing `./mikes-macos-disk-cleanup.sh`.
-4. Panic because all your files are now gone and are never coming back.
+1. `npx mikes-macos-developer-disk-cleanup`
+2. Panic because all your files are now gone and are never coming back.
 
 ## Important Notes
 

package/mikes-macos-disk-cleanup.sh

@@ -26,6 +26,7 @@
 # - Android SDK packages
 # - Android AVDs
 # - Homebrew caches
+# - CocoaPods
 
 # ==== 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
@@ -68,9 +69,16 @@ if [ ${INITIALISED:-0} -ne 1 ]; then
       fi
       printf "DEVELOPMENT_BASE_DIR=${DEVELOPMENT_BASE_DIR}\n" >${CONFIGFILE}
       echo "Configuration saved to ${CONFIGFILE}"
+      echo "NOTE: subsequent invocations will immediately commence deleting files!"
     else
       echo "Not saving configuration..."
     fi
+
+    read -p "Deleting is about to start! Proceed? [y/n]" SHOULD_PROCEED
+    if [ "${SHOULD_PROCEED}" != "y" ]; then
+      echo "Exiting..."
+      exit 1
+    fi
   fi
 
   echo "Using development base directory: ${DEVELOPMENT_BASE_DIR}"
@@ -84,7 +92,12 @@ INITIALISED=1 # set to 1 so that the script will not prompt again (only really m
 
 # ==== END OF CONFIGURATION ====
 # get the full path for the current dir
-DIR=$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)
+#   - if this is being run via "npx" then "${BASH_SOURCE[0]}" will be a symlink,
+#     so we need to get the full path to the script (and not just the symlink) so 
+#     we can load the modules from the correct location
+
+RESOLVED_SOURCE="$(node -e "const path = require('path');fs = require('fs');console.log(fs.realpathSync('${BASH_SOURCE[0]}'));")"
+DIR=$(dirname "${RESOLVED_SOURCE}")
 
 # ===== Error handling =======
 # set -e: exit on error
@@ -115,29 +128,36 @@ INITIALSPACE=$(
 )
 echo "DISK USAGE BEFORE CLEANUP: ${INITIALSPACE}"
 
-# # remove everything in ~/Library/Caches
-# source "${DIR}/modules/library-caches.sh"
-# libraryCaches
+# addHint function
+source "${DIR}/modules/hints.sh"
+
+# CocoaPods
+source "${DIR}/modules/cocoapods.sh"
+cocoapods
 
-# # remove everything from Trash - this sometimes prompts for confirmation
-# source "${DIR}/modules/trash.sh"
-# trash
+# remove everything in ~/Library/Caches
+source "${DIR}/modules/library-caches.sh"
+libraryCaches
 
-# # meteor
-# source "${DIR}/modules/meteor-builds-and-packages.sh"
-# meteorBuildsAndPackages
+# remove everything from Trash - this sometimes prompts for confirmation
+source "${DIR}/modules/trash.sh"
+trash
 
-# # npm cache
-# source "${DIR}/modules/npm-cache.sh"
-# npmCache
+# meteor
+source "${DIR}/modules/meteor-builds-and-packages.sh"
+meteorBuildsAndPackages
 
-# # yarn cache
-# source "${DIR}/modules/yarn-cache.sh"
-# yarnCache
+# npm cache
+source "${DIR}/modules/npm-cache.sh"
+npmCache
 
-# # bun cache
-# source "${DIR}/modules/bun-cache.sh"
-# bunCache
+# 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"
@@ -165,7 +185,20 @@ androidBuildFolders
 
 # Android SDKs
 source "${DIR}/modules/android-sdk.sh"
+set +e ; # don't exit on error
 androidSDK
+RETCODE=$?
+set -e; # exit on error
+
+if [ ${RETCODE} -ne 0 ]; then
+  if [ ${RETCODE} -eq 100 ]; then
+    echo "Android SDK packages already only have one version installed. Proceeding."
+  else
+    echo "!!! Failed to clean up Android SDKs !!!"
+    echo "    check the output above for more info"
+    exit ${RETCODE}
+  fi
+fi
 
 # Android AVDs
 source "${DIR}/modules/android-avd.sh"
@@ -185,8 +218,8 @@ FINALSPACE=$(
     }'
 )
 
-echo "=== FINISHED! ==="
+echo "============================== FINISHED! ================================="
 
-echo "DISK USAGE BEFORE CLEANUP: ${INITIALSPACE}"
-echo "DISK USAGE AFTER CLEANUP: ${FINALSPACE}"
+echo "BEFORE CLEANUP: ${INITIALSPACE}"
+echo "NOW: ${FINALSPACE}"
 echo "${HINTS_UPON_FINISH}"

package/modules/android-avd.sh

@@ -1,6 +1,6 @@
 androidAVD() {
     # Android Virtual Device Cleanup
-    command -v avdmanager >/dev/null 2>&1 && {
+    command -v ${ANDROID_HOME}/tools/bin/avdmanager >/dev/null 2>&1 && {
         # get the full path from one of the AVDs
         local FIRST_AVD_PATH=$(avdmanager list avd | grep  "Path:" | head -1 | tr -s " "| cut -f3 -d" ")
 
@@ -21,7 +21,7 @@ androidAVD() {
         local AVDFOLDERSIZEAFTER=$(du -hs "${FIRST_AVD_PARENTPATH}" | cut -f1)
         echo "    AVD folder size before: ${AVDFOLDERSIZEBEFORE}; after: ${AVDFOLDERSIZEAFTER}"
     } || {
-        echo "'avdmanager' command not found"
+        echo "'${ANDROID_HOME}/tools/bin/avdmanager' command not found"
         return 1
     }
 }

package/modules/android-sdk.sh

@@ -2,23 +2,29 @@ androidSDK() {
     local THISMODULEDIR=$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)
 
     # Android SDK Manager Cleanup
-    command -v sdkmanager >/dev/null 2>&1 && {
+    command -v ${ANDROID_HOME}/tools/bin/sdkmanager >/dev/null 2>&1 && {
 
         local ANDROIDHOME_BEFORE=$(du -hs $ANDROID_HOME | cut -f1)
 
         echo "=== android sdkmanager cleanup ==="
         echo "  - BEFORE CLEANUP: ${ANDROIDHOME_BEFORE} (${ANDROID_HOME})"
 
+        # remove .downloadIntermediates folder if it exists
+        if [ -d "${ANDROID_HOME}/.downloadIntermediates" ]; then
+            echo "    - removing ${ANDROID_HOME}/.downloadIntermediates"
+            rm -rf "${ANDROID_HOME}/.downloadIntermediates"
+        fi
         # create temporary output file
         local OUTFILENAME=$(mktemp)
 
-        sdkmanager --list_installed --include_obsolete |
+        local SDKMANAGER_OUTPUT=$(sdkmanager --list_installed --include_obsolete)
+        echo "${SDKMANAGER_OUTPUT}" |
             awk -f "${THISMODULEDIR}/android-sdk.awk" -v outputFile="${OUTFILENAME}"
 
         if [ $? -ne 0 ]; then
             echo "    WARNING: we couldn't parse the output of 'sdkmanager --list_installed --include_obsolete'"
-            echo "    (maybe there's just nothing to remove?)"
-            return 1
+            echo "    (very likely there's just nothing to remove)"
+            return 100
         fi
 
         echo "    - packages to remove: "
@@ -28,10 +34,11 @@ androidSDK() {
         sdkmanager --uninstall --package_file="${OUTFILENAME}"
         local ANDROIDHOME_AFTER=$(du -hs $ANDROID_HOME | cut -f1)
 
-        echo "  - BEFORE CLEANUP: ${ANDROIDHOME_BEFORE} (${ANDROID_HOME})"
-        echo "  - AFTER CLEANUP: ${ANDROIDHOME_AFTER}"
+        echo "  - BEFORE ANDROID SDKMANAGER CLEANUP: ${ANDROIDHOME_BEFORE} (${ANDROID_HOME})"
+        echo "  - AFTER ANDROID SDKMANAGER CLEANUP: ${ANDROIDHOME_AFTER}"
+        addHint "- You may need to run android's SDK manager to restore the Android SDK versions you were using"
     } || {
-        echo "'sdkmanager' command not found"
+        echo "'${ANDROID_HOME}/tools/bin/sdkmanager' command not found"
         return 1
     }
 }

package/modules/cocoapods.sh

@@ -0,0 +1,32 @@
+cocoapods() {
+    if [ -d ${HOME}/.cocoapods ]; then
+        # Pods folders
+        echo "=== clearing Pods folders ==="
+        pod cache clean --all
+        echo "  - looking for Pods folders in ${DEVELOPMENT_BASE_DIR}... "
+        local PODS_FOLDERS=$(
+            find -E "${DEVELOPMENT_BASE_DIR}" -type d \
+                -regex '^.*Pods$' \
+                -not -regex "${HOME}/\..*" \
+                -not -regex "^.*Pods.+"
+        )
+        echo "  - found Pods folders:"
+        IFS=$'\n' # make newlines the only separator
+        for PODS_FOLDER in ${PODS_FOLDERS}; do
+            echo "  - ${PODS_FOLDER}"
+        done
+        echo "  - running 'rm -rf ' in each of the above"
+        local PODS_WERE_REMOVED=0
+        for PODS_FOLDER in ${PODS_FOLDERS}; do
+            PODS_WERE_REMOVED=1
+            local PODS_FOLDER_SIZE=$(du -hs "${PODS_FOLDER}" | cut -f1)
+            printf "  - removing '${PODS_FOLDER}' (${PODS_FOLDER_SIZE}) ... "
+            rm -rf "${PODS_FOLDER}"
+            echo "done"
+        done
+        unset IFS
+        if [ ${PODS_WERE_REMOVED} -eq 1 ]; then
+            addHint "- You'll need to perform a 'pod install' (or npx pod-install) in each of your projects"
+        fi
+    fi
+}

package/modules/hints.sh

@@ -0,0 +1,9 @@
+addHint(){
+    local HINTLENGTH=${#HINTS_UPON_FINISH}
+    if [ ${HINTLENGTH} -gt 0 ]; then
+        # add a newline if there was a previous hint
+        HINTS_UPON_FINISH=$(printf "%s\n%s", "${HINTS_UPON_FINISH}", "${1}")
+    else
+        HINTS_UPON_FINISH="${1}"
+    fi
+}

package/modules/node-modules.sh

@@ -13,13 +13,18 @@ nodeModules() {
     for NODE_MODULE_FOLDER in ${NODE_MODULE_FOLDERS}; do
         echo "  - ${NODE_MODULE_FOLDER}"
     done
+    local MODULESWERE_REMOVED=0
     echo "  - running 'rm -rf ' in each of the above"
     for NODE_MODULE_FOLDER in ${NODE_MODULE_FOLDERS}; do
+        MODULESWERE_REMOVED=1
         local NODE_MODULE_SIZE=$(du -hs "${NODE_MODULE_FOLDER}" | cut -f1)
         printf "  - removing '${NODE_MODULE_FOLDER}' (${NODE_MODULE_SIZE}) ... "
         rm -rf "${NODE_MODULE_FOLDER}"
         echo "done"
     done
     unset IFS
+    if [ ${MODULESWERE_REMOVED} -eq 1 ]; then
+        addHint "- You will need to reinstall node modules in each of your projects"
+    fi
 
 }

package/modules/ruby-gems.sh

@@ -40,5 +40,9 @@ rubyGems() {
         done
 
         unset IFS
+        rvm use
     }
+
+    addHint "- You might need to reinstall your ruby gems"
+    addHint "  - e.g. gem install cocoapods"
 }

package/modules/xcode-artifacts.sh

@@ -20,7 +20,7 @@ xcodeArtifacts() {
         # Xcode DeviceLogs
         if [ -d ${HOME}/Library/Developer/CoreSimulator/Caches ]; then
             local XCCACHESIZE=$(du -hs ${HOME}/Library/Developer/CoreSimulator/Caches | cut -f1)
-            echo "   removing Xcode Caches (${XCCACHESIZE})..."
+            echo "   removing Xcode CoreSimulator Caches (${XCCACHESIZE})..."
             rm -rf ${HOME}/Library/Developer/CoreSimulator/Caches
         fi
 
@@ -35,11 +35,11 @@ xcodeArtifacts() {
                     awk '{\
             r=$0;\
             gsub(/^[^[:space:]]+[[:space:]]+/,"",r);\
-            printf("- This command would recover %s:\n    rm -rf \"%s\"\n",$1, r);\
+            printf("- This command would recover an additional %s:\n    rm -rf \"%s\"\n",$1, r);\
           }'
             )
             echo "${DEVICESUPPORTCOMMAND}"
-            HINTS_UPON_FINISH=$(printf "${HINTS_UPON_FINISH}\n${DEVICESUPPORTCOMMAND}")
+            addHint "${DEVICESUPPORTCOMMAND}"
         fi
     fi # xcode
 }

package/package.json

@@ -1,10 +1,9 @@
 {
   "name": "mikes-macos-developer-disk-cleanup",
-  "version": "1.0.1",
+  "version": "1.0.4",
   "description": "Cleans up a developer's mac disk space. Aggressively.",
   "bin": {
-    "mikes-macos-disk-cleanup": "mikes-macos-disk-cleanup.sh",
-    "modules": "modules"
+    "mikes-macos-disk-cleanup": "mikes-macos-disk-cleanup.sh"
   },
   "scripts": {
     "test": "echo \"Error: no test specified\" && exit 1"