Merge pull request #151 from unixorn/fix-bad-entitlement-link

Fix bad entitlement link

Author: unixorn

README.md

@@ -67,7 +67,7 @@ The Tumult collection is Apache 2.0 licensed. Some scripts in the `bin` director
 | `disturb` | Re-enable notifications in Notification Center |
 | `dns-resolvers` | macOS doesn't respect `/etc/resolve.conf`, add a helper to print what it's actually using |
 | `do-not-disturb` | Stifle notifications in Notification Center |
-| `dump-entitlements` | Dumps the [entitlements](https://developer.apple.com/documentation/bundleresources/entitlements) a given macOS binary has assigned to it |
+| `dump-entitlements` | Dumps the [entitlements](https://developer.apple.com/library/archive/documentation/Miscellaneous/Reference/EntitlementKeyReference/Chapters/AboutEntitlements.html) a given macOS binary has assigned to it |
 | `eject-all` | Eject all removable disks |
 | `enable-bouncing-dock-icons` | Enable icons bouncing in your Dock |
 | `enable-crash-reports` | Re-enable crash report dialogs |

bin/720p

@@ -21,6 +21,14 @@ if [ "$(uname -a | grep -ci DARWIN)" != 1 ]; then
   exit 1
 fi
 
+function check-dependency() {
+    if ! (builtin command -V "$1" >/dev/null 2>&1); then
+        error "missing dependency: can't find $1"
+        exit 1
+    fi
+}
+check-dependency osascript
+
 echo "Setting $1 bounds to 720p"
 
 # 720p is 1280x720.

bin/ask-password

@@ -1,6 +1,8 @@
 #!/bin/bash
 #
 # Make it easy to ask for a password
+#
+# Copyright 2015-2025 Joe Block <[email protected]>
 
 set -e
 
@@ -9,6 +11,14 @@ if [[ "$(uname -s)" != 'Darwin' ]]; then
   exit 1
 fi
 
+function check-dependency() {
+  if ! (builtin command -V "$1" >/dev/null 2>&1); then
+      error "missing dependency: can't find $1 in your PATH"
+      exit 1
+  fi
+}
+check-dependency osascript
+
 if [[ -z $1 ]]; then
   prompt="Password:"
 else

bin/autocorrect-disable

@@ -2,6 +2,14 @@
 #
 # Disable autocorrect
 #
-# Copyright 2021, Joe Block <[email protected]>
+# Copyright 2021-2025, Joe Block <[email protected]>
+
+function check-dependency() {
+  if ! (builtin command -V "$1" >/dev/null 2>&1); then
+      error "missing dependency: can't find $1 in your PATH"
+      exit 1
+  fi
+}
+check-dependency defaults
 
 exec defaults write NSGlobalDomain NSAutomaticSpellingCorrectionEnabled -bool false

bin/autocorrect-enable

@@ -2,6 +2,14 @@
 #
 # Enable autocorrect
 #
-# Copyright 2021, Joe Block <[email protected]>
+# Copyright 2021-2025, Joe Block <[email protected]>
+
+function check-dependency() {
+  if ! (builtin command -V "$1" >/dev/null 2>&1); then
+      error "missing dependency: can't find $1 in your PATH"
+      exit 1
+  fi
+}
+check-dependency defaults
 
 exec defaults write NSGlobalDomain NSAutomaticSpellingCorrectionEnabled -bool true

bin/battery-percentage

@@ -1,5 +1,5 @@
 #!/bin/bash
-# Copyright 2015,2022 Joseph Block <[email protected]>
+# Copyright 2015-2025 Joseph Block <[email protected]>
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -20,6 +20,14 @@ if [[ "$(uname -s)" != 'Darwin' ]]; then
   exit 1
 fi
 
+function check-dependency() {
+  if ! (builtin command -V "$1" >/dev/null 2>&1); then
+      error "missing dependency: can't find $1 in your PATH"
+      exit 1
+  fi
+}
+check-dependency pmset
+
 # Print battery percentage
 pmset -g batt | grep -E "([0-9]+\%).*" -o --colour=auto | cut -f1 -d';'
 exit $?

bin/battery-time

@@ -1,5 +1,5 @@
 #!/bin/bash
-# Copyright 2015,2022 Joseph Block <[email protected]>
+# Copyright 2015-2025 Joseph Block <[email protected]>
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -20,6 +20,14 @@ if [[ "$(uname -s)" != 'Darwin' ]]; then
   exit 1
 fi
 
+function check-dependency() {
+  if ! (builtin command -V "$1" >/dev/null 2>&1); then
+      error "missing dependency: can't find $1 in your PATH"
+      exit 1
+  fi
+}
+check-dependency pmset
+
 # Print system's estimate of battery time remaining
 pmset -g batt | grep -E "([0-9]+\%).*" -o --colour=auto | cut -f3 -d';'
 exit $?

bin/bundle-id

@@ -2,10 +2,18 @@
 #
 # Print the bundle ID of an application
 #
-# Copyright 2022, Joe Block <[email protected]>
+# Copyright 2022-2025 Joe Block <[email protected]>
 if [[ "$(uname -s)" != 'Darwin' ]]; then
   echo 'Sorry, this script only works on macOS'
   exit 1
 fi
 
+function check-dependency() {
+  if ! (builtin command -V "$1" >/dev/null 2>&1); then
+      error "missing dependency: can't find $1 in your PATH"
+      exit 1
+  fi
+}
+check-dependency osascript
+
 exec osascript -e "id of app \"$1\""

bin/change-wallpaper

@@ -1,6 +1,8 @@
 #!/bin/bash
 #
 # Force wallpaper to switch immediately
+#
+# Copyright 2016-2025 Joe Block <[email protected]>
 
 set -e
 
@@ -9,6 +11,14 @@ if [[ "$(uname -s)" != 'Darwin' ]]; then
   exit 1
 fi
 
+function check-dependency() {
+  if ! (builtin command -V "$1" >/dev/null 2>&1); then
+      error "missing dependency: can't find $1 in your PATH"
+      exit 1
+  fi
+}
+check-dependency osascript
+
 exec osascript <<EOF
 tell application "System Events"
     tell current desktop

bin/charger-wattage

@@ -2,7 +2,7 @@
 #
 # Show the wattage of your charger
 #
-# Copyright 2021, Joe Block <[email protected]>
+# Copyright 2021-2025, Joe Block <[email protected]>
 
 set -o pipefail
 if [[ -n "$DEBUG" ]]; then
@@ -29,14 +29,21 @@ function charger-wattage() {
   pmset -g ac | awk '/Wattage/ {print $3}'
 }
 
-if [[ "$(uname -s)" != 'Darwin' ]]; then
-  echo 'Sorry, this script only works on macOS'
-  exit 1
-fi
+function only-run-on() {
+  if [[ "$(uname -s)" != "$1" ]]; then
+    echo "This script only runs on $1"
+    exit 1
+  fi
+}
 
-if has pmset; then
-  charger-wattage
-else
-  # shellcheck disable=SC2016
-  fail 'Cannot find pmset in your $PATH'
-fi
+function check-dependency() {
+  if ! (builtin command -V "$1" >/dev/null 2>&1); then
+      error "missing dependency: can't find $1 in your PATH"
+      exit 1
+  fi
+}
+
+only-run-on Darwin
+check-dependency pmset
+
+charger-wattage

bin/chrome-tabs

@@ -11,6 +11,14 @@ ts () {
   date +'%Fz%T'
 }
 
+function check-dependency() {
+  if ! (builtin command -V "$1" >/dev/null 2>&1); then
+      error "missing dependency: can't find $1 in your PATH"
+      exit 1
+  fi
+}
+check-dependency osascript
+
 chrome_tabs () {
   # shellcheck disable=SC2046
   for win in $(seq 0 $(osascript -e 'tell application "Chrome" to get count every window'))

bin/clean-clipboard

@@ -1,10 +1,21 @@
 #!/bin/bash
 #
 # Convert contents of clipboard to plain text.
+#
+# Copyright 2015-2025, Joe Block <[email protected]>
 
 if [[ "$(uname -s)" != 'Darwin' ]]; then
   echo 'Sorry, this script only works on macOS'
   exit 1
 fi
 
+function check-dependency() {
+  if ! (builtin command -V "$1" >/dev/null 2>&1); then
+      error "missing dependency: can't find $1 in your PATH"
+      exit 1
+  fi
+}
+check-dependency pbpaste
+check-dependency textutil
+
 pbpaste | textutil -convert txt -stdin -stdout -encoding 30 | pbcopy

bin/clean-xml-clip

@@ -2,7 +2,7 @@
 #
 # Clean up the XML in the clipboard
 #
-# Copyright 2017, Joe Block <[email protected]>
+# Copyright 2017-2025, Joe Block <[email protected]>
 
 set -o pipefail
 
@@ -11,15 +11,15 @@ if [[ "$(uname -s)" != 'Darwin' ]]; then
   exit 1
 fi
 
-function has() {
-  # Check if a command is in $PATH
-  which "$@" > /dev/null 2>&1
+function check-dependency() {
+  if ! (builtin command -V "$1" >/dev/null 2>&1); then
+      error "missing dependency: can't find $1 in your PATH"
+      exit 13
+  fi
 }
 
-if ! has tidy; then
-  echo 'tidy not found in $PATH!'
-  exit 13
-fi
+check-dependency pbpaste
+check-dependency tidy
 
 pbpaste | tidy -xml -wrap 0 | pbcopy
 exit $?

bin/clear-macos-font-cache

@@ -8,6 +8,14 @@ if [[ "$(uname -s)" != 'Darwin' ]]; then
   exit 1
 fi
 
+function check-dependency() {
+  if ! (builtin command -V "$1" >/dev/null 2>&1); then
+      error "missing dependency: can't find $1 in your PATH"
+      exit 1
+  fi
+}
+check-dependency atsutil
+
 atsutil databases -removeUser && \
 atsutil server -shutdown && \
 atsutil server -ping

bin/clear-osx-font-cache

@@ -8,6 +8,14 @@ if [[ "$(uname -s)" != 'Darwin' ]]; then
   exit 1
 fi
 
+function check-dependency() {
+  if ! (builtin command -V "$1" >/dev/null 2>&1); then
+      error "missing dependency: can't find $1 in your PATH"
+      exit 1
+  fi
+}
+check-dependency atsutil
+
 atsutil databases -removeUser && \
 atsutil server -shutdown && \
 atsutil server -ping

bin/clip

@@ -1,11 +1,20 @@
 #!/bin/bash
 #
 # clipboard helper
+#
+# Copyright 2016-2025 Joe Block <[email protected]>
 
 if [[ "$(uname -s)" != 'Darwin' ]]; then
   echo 'Sorry, this script only works on macOS'
   exit 1
 fi
+function check-dependency() {
+  if ! (builtin command -V "$1" >/dev/null 2>&1); then
+      error "missing dependency: can't find $1 in your PATH"
+      exit 1
+  fi
+}
+check-dependency pbcopy
 
 # shellcheck disable=SC2071
 if [[ $# > 0 ]]; then

bin/column-view

@@ -1,6 +1,6 @@
 #!/bin/bash
 #
-# Copyright 2015 Joseph Block <[email protected]>
+# Copyright 2015-2025 Joseph Block <[email protected]>
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -21,6 +21,14 @@ if [[ "$(uname -s)" != 'Darwin' ]]; then
   exit 1
 fi
 
+function check-dependency() {
+  if ! (builtin command -V "$1" >/dev/null 2>&1); then
+      error "missing dependency: can't find $1 in your PATH"
+      exit 1
+  fi
+}
+check-dependency osascript
+
 exec osascript <<EOT
   set cwd to do shell script "pwd"
   tell application "Finder"

bin/darktoggle

@@ -8,16 +8,28 @@ function fail() {
   exit "${2-1}"  ## Return a code specified by $2 or 1 by default.
 }
 
-if [[ "$(uname -s)" = "Darwin" ]]; then
-  read -d '' darktoggle << EOR
+function only-run-on() {
+  if [[ "$(uname -s)" != "$1" ]]; then
+    echo "This script only runs on $1"
+    exit 1
+  fi
+}
+
+function check-dependency() {
+  if ! (builtin command -V "$1" >/dev/null 2>&1); then
+      error "missing dependency: can't find $1 in your PATH"
+      exit 1
+  fi
+}
+
+only-run-on Darwin
+check-dependency osascript
+
+read -d '' darktoggle << EOR
 tell application "System Events"
         tell appearance preferences
                 set dark mode to not dark mode
         end tell
 end tell
 EOR
 echo $darktoggle | osascript
-else
-  myname=$(basename "$0")
-  fail "darktoggle only works on macOS"
-fi