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

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

@@ -84,7 +84,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 +120,29 @@ INITIALSPACE=$(
 )
 echo "DISK USAGE BEFORE CLEANUP: ${INITIALSPACE}"
 
-# # remove everything in ~/Library/Caches
-# source "${DIR}/modules/library-caches.sh"
-# libraryCaches
+# 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
+# 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
+# meteor
+source "${DIR}/modules/meteor-builds-and-packages.sh"
+meteorBuildsAndPackages
 
-# # npm cache
-# source "${DIR}/modules/npm-cache.sh"
-# npmCache
+# npm cache
+source "${DIR}/modules/npm-cache.sh"
+npmCache
 
-# # yarn cache
-# source "${DIR}/modules/yarn-cache.sh"
-# yarnCache
+# yarn cache
+source "${DIR}/modules/yarn-cache.sh"
+yarnCache
 
-# # bun cache
-# source "${DIR}/modules/bun-cache.sh"
-# bunCache
+# bun cache
+source "${DIR}/modules/bun-cache.sh"
+bunCache
 
 # ### XCode ###
 source "${DIR}/modules/xcode-artifacts.sh"

package/package.json

@@ -1,10 +1,9 @@
 {
   "name": "mikes-macos-developer-disk-cleanup",
-  "version": "1.0.1",
+  "version": "1.0.3",
   "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"