+
+
+
+
+
+ + Strap is a script to bootstrap a minimal macOS development system with the minimal set of settings and software + every macOS developer will want. +
+ To Strap your system: +-
+
-
+
+ Download the
strap.shscript. + +
+
+ -
+ Run Strap in Terminal.app with
bash ~/Downloads/strap.sh. +
+
+ -
+ If something failed, run Strap with more debugging output in
+ Terminal.app with
bash ~/Downloads/strap.sh --debugand + try to debug it yourself, I can't help you, sorry! +
+
+ -
+ Install additional software with
+
brew install. +
+
+ In 2023 I started a company, ☕️ Workbrew, to provide the missing features and support for companies using
+ Homebrew.
+
+ Workbrew is now available in public beta and has a Workbrew Bootstrap feature that's basically
+ Strap v2.
+
+ Additionally, Workbrew provides MDM integration, fleet configuration, remote brew command execution
+ and much more.
+
+ Please try it out or
+ book a demo.
+
+
+
+
+
+
+
diff --git a/robots.txt b/robots.txt
new file mode 100644
index 000000000..f0a7ed75c
--- /dev/null
+++ b/robots.txt
@@ -0,0 +1,5 @@
+---
+---
+User-agent: *
+Disallow:
+Sitemap: {{ site.url }}/sitemap.xml
diff --git a/script/bootstrap b/script/bootstrap
index cad4cf00a..c87df6ebc 100755
--- a/script/bootstrap
+++ b/script/bootstrap
@@ -3,10 +3,6 @@ set -eu
cd "$(dirname "$0")/.."
-(command -v bundle >/dev/null 2>&1 && bundle -v >/dev/null 2>&1) || {
- gem install bundler
-}
-
bundle check >/dev/null 2>&1 || {
bundle install
}
diff --git a/script/server b/script/server
index a77a0ec0b..3de8a7f06 100755
--- a/script/server
+++ b/script/server
@@ -3,5 +3,4 @@ set -eu
cd "$(dirname "$0")/.."
-export PORT="${PORT:-3000}"
-bundle exec puma --port "$PORT" --config web/puma.rb
+bundle exec jekyll serve --watch --incremental --strict_front_matter
diff --git a/script/style b/script/style
index f1c076373..290b0e14d 100755
--- a/script/style
+++ b/script/style
@@ -17,7 +17,7 @@ sudo_askpass_style() {
local violations
violations=$(
# find all sudo and filter out allowed calls
- grep --line-number "[^'\"]sudo " bin/strap.sh |
+ grep --line-number "[^'\"]sudo " strap.sh |
grep "${grep_regex_arg}" -v "^\d*: *#" |
grep -v "pam_tid /etc/pam.d/sudo /etc/pam.d/sudo_local" |
grep -v "sudo --reset-timestamp" |
@@ -42,18 +42,6 @@ EOS
fi
}
-ruby_version_style() {
- local ruby_version
- ruby_version="$(cat .ruby-version)"
-
- for file in "$@"; do
- if ! git grep --quiet "ruby.${ruby_version}" HEAD -- "${file}"; then
- echo "Error: ${file} does not contain 'ruby ${ruby_version}'!" >&2
- exit 1
- fi
- done
-}
-
shell_style() {
local shfmt_args="--indent 2 --simplify --language-dialect=bash"
@@ -73,20 +61,8 @@ shell_style() {
shellcheck "$@"
}
-ruby_style() {
- if [[ -n ${STYLE_FIX-} ]]; then
- local rubocop_args="--autocorrect-all"
- fi
-
- bundle exec rubocop --format quiet ${rubocop_args-}
-}
-
script/bootstrap
sudo_askpass_style
-ruby_version_style Gemfile.lock
-
-shell_style bin/strap.sh script/*
-
-ruby_style
+shell_style strap.sh script/*
diff --git a/script/tests b/script/tests
index 44e857d92..3a5142f46 100755
--- a/script/tests
+++ b/script/tests
@@ -3,23 +3,4 @@ set -xeuo pipefail
cd "$(dirname "$0")/.."
-export PUMA_PIDFILE="puma.pid"
-
-tests_cleanup() {
- if [[ -n ${SERVER_PID-} ]]; then
- kill "${SERVER_PID}"
- fi
-}
-
-trap "tests_cleanup" EXIT
-
-script/bootstrap
-script/server &
-sleep 5
-
-SERVER_PID=$(cat "${PUMA_PIDFILE}")
-
-curl -O http://localhost:3000/strap.sh
-curl -sSL -D - -o /dev/null http://localhost:3000/strap.sh | grep -i "x-frame-options: DENY"
-
-kill "$SERVER_PID"
+bundle exec jekyll build --incremental --strict_front_matter
diff --git a/bin/strap.sh b/strap.sh
similarity index 58%
rename from bin/strap.sh
rename to strap.sh
index 750e2c266..075dbb4db 100755
--- a/bin/strap.sh
+++ b/strap.sh
@@ -1,5 +1,5 @@
#!/bin/bash
-#/ Usage: bin/strap.sh [--debug]
+#/ Usage: strap.sh [--debug]
#/ Install development dependencies on macOS.
set -e
@@ -26,8 +26,6 @@ cleanup() {
fi
if [ -z "$STRAP_DEBUG" ]; then
echo "!!! Run '$0 --debug' for debugging output." >&2
- echo "!!! If you're stuck: file an issue with debugging output at:" >&2
- echo "!!! $STRAP_ISSUES_URL" >&2
fi
fi
}
@@ -44,15 +42,6 @@ fi
STDIN_FILE_DESCRIPTOR="0"
[ -t "$STDIN_FILE_DESCRIPTOR" ] && STRAP_INTERACTIVE="1"
-# Set by web/app.rb
-# STRAP_GIT_NAME=
-# STRAP_GIT_EMAIL=
-# STRAP_GITHUB_USER=
-# STRAP_GITHUB_TOKEN=
-# CUSTOM_HOMEBREW_TAP=
-# CUSTOM_BREW_COMMAND=
-STRAP_ISSUES_URL='https://github.com/MikeMcQuaid/strap/issues/new'
-
# We want to always prompt for sudo password at least once rather than doing
# root stuff unexpectedly.
sudo --reset-timestamp
@@ -168,6 +157,7 @@ run_dotfile_scripts() {
else
"$i"
fi
+ logk
break
fi
done
@@ -213,24 +203,10 @@ fi
# Set some basic security settings.
logn "Configuring security settings:"
-sudo_askpass defaults write com.apple.Safari \
- com.apple.Safari.ContentPageGroupIdentifier.WebKit2JavaEnabled \
- -bool false
-sudo_askpass defaults write com.apple.Safari \
- com.apple.Safari.ContentPageGroupIdentifier.WebKit2JavaEnabledForLocalFiles \
- -bool false
sudo_askpass defaults write com.apple.screensaver askForPassword -int 1
sudo_askpass defaults write com.apple.screensaver askForPasswordDelay -int 0
sudo_askpass defaults write /Library/Preferences/com.apple.alf globalstate -int 1
sudo_askpass launchctl load /System/Library/LaunchDaemons/com.apple.alf.agent.plist 2>/dev/null
-
-if [ -n "$STRAP_GIT_NAME" ] && [ -n "$STRAP_GIT_EMAIL" ]; then
- LOGIN_TEXT=$(escape "Found this computer? Please contact $STRAP_GIT_NAME at $STRAP_GIT_EMAIL.")
- echo "$LOGIN_TEXT" | grep -q '[()]' && LOGIN_TEXT="'$LOGIN_TEXT'"
- sudo_askpass defaults write /Library/Preferences/com.apple.loginwindow \
- LoginwindowText \
- "$LOGIN_TEXT"
-fi
logk
# Check and enable full-disk encryption.
@@ -291,86 +267,54 @@ xcode_license() {
}
xcode_license
-# Setup Git configuration.
-logn "Configuring Git:"
-if [ -n "$STRAP_GIT_NAME" ] && ! git config user.name >/dev/null; then
- git config --global user.name "$STRAP_GIT_NAME"
-fi
-
-if [ -n "$STRAP_GIT_EMAIL" ] && ! git config user.email >/dev/null; then
- git config --global user.email "$STRAP_GIT_EMAIL"
-fi
-
-if [ -n "$STRAP_GITHUB_USER" ] && [ "$(git config github.user)" != "$STRAP_GITHUB_USER" ]; then
- git config --global github.user "$STRAP_GITHUB_USER"
-fi
-
-# Squelch git 2.x warning message when pushing
-if ! git config push.default >/dev/null; then
- git config --global push.default simple
-fi
-
-# Setup GitHub HTTPS credentials.
-if git credential-osxkeychain 2>&1 | grep $Q "git.credential-osxkeychain"; then
- # Actually execute the credential in case it's a wrapper script for credential-osxkeychain
- if git "credential-$(git config --global credential.helper 2>/dev/null)" 2>&1 |
- grep -v $Q "git.credential-osxkeychain"; then
- git config --global credential.helper osxkeychain
+logn "Installing Homebrew:"
+if [[ ! -f "/opt/workbrew/bin/brew" ]]; then
+ # Setup Homebrew directory and permissions.
+ HOMEBREW_PREFIX="$(brew --prefix 2>/dev/null || true)"
+ HOMEBREW_REPOSITORY="$(brew --repository 2>/dev/null || true)"
+ if [ -z "$HOMEBREW_PREFIX" ] || [ -z "$HOMEBREW_REPOSITORY" ]; then
+ UNAME_MACHINE="$(/usr/bin/uname -m)"
+ if [[ $UNAME_MACHINE == "arm64" ]]; then
+ HOMEBREW_PREFIX="/opt/homebrew"
+ HOMEBREW_REPOSITORY="${HOMEBREW_PREFIX}"
+ else
+ HOMEBREW_PREFIX="/usr/local"
+ HOMEBREW_REPOSITORY="${HOMEBREW_PREFIX}/Homebrew"
+ fi
fi
-
- if [ -n "$STRAP_GITHUB_USER" ] && [ -n "$STRAP_GITHUB_TOKEN" ]; then
- printf 'protocol=https\nhost=github.com\n' | git credential reject
- printf 'protocol=https\nhost=github.com\nusername=%s\npassword=%s\n' \
- "$STRAP_GITHUB_USER" "$STRAP_GITHUB_TOKEN" |
- git credential approve
+ [ -d "$HOMEBREW_PREFIX" ] || sudo_askpass mkdir -p "$HOMEBREW_PREFIX"
+ if [ "$HOMEBREW_PREFIX" = "/usr/local" ]; then
+ sudo_askpass chown "root:wheel" "$HOMEBREW_PREFIX" 2>/dev/null || true
fi
-fi
-logk
+ (
+ cd "$HOMEBREW_PREFIX"
+ sudo_askpass mkdir -p Cellar Caskroom Frameworks bin etc include lib opt sbin share var
+ sudo_askpass chown "$USER:admin" Cellar Caskroom Frameworks bin etc include lib opt sbin share var
+ )
-# Setup Homebrew directory and permissions.
-logn "Installing Homebrew:"
-HOMEBREW_PREFIX="$(brew --prefix 2>/dev/null || true)"
-HOMEBREW_REPOSITORY="$(brew --repository 2>/dev/null || true)"
-if [ -z "$HOMEBREW_PREFIX" ] || [ -z "$HOMEBREW_REPOSITORY" ]; then
- UNAME_MACHINE="$(/usr/bin/uname -m)"
- if [[ $UNAME_MACHINE == "arm64" ]]; then
- HOMEBREW_PREFIX="/opt/homebrew"
- HOMEBREW_REPOSITORY="${HOMEBREW_PREFIX}"
- else
- HOMEBREW_PREFIX="/usr/local"
- HOMEBREW_REPOSITORY="${HOMEBREW_PREFIX}/Homebrew"
- fi
-fi
-[ -d "$HOMEBREW_PREFIX" ] || sudo_askpass mkdir -p "$HOMEBREW_PREFIX"
-if [ "$HOMEBREW_PREFIX" = "/usr/local" ]; then
- sudo_askpass chown "root:wheel" "$HOMEBREW_PREFIX" 2>/dev/null || true
-fi
-(
- cd "$HOMEBREW_PREFIX"
- sudo_askpass mkdir -p Cellar Caskroom Frameworks bin etc include lib opt sbin share var
- sudo_askpass chown "$USER:admin" Cellar Caskroom Frameworks bin etc include lib opt sbin share var
-)
+ [ -d "$HOMEBREW_REPOSITORY" ] || sudo_askpass mkdir -p "$HOMEBREW_REPOSITORY"
+ sudo_askpass chown -R "$USER:admin" "$HOMEBREW_REPOSITORY"
-[ -d "$HOMEBREW_REPOSITORY" ] || sudo_askpass mkdir -p "$HOMEBREW_REPOSITORY"
-sudo_askpass chown -R "$USER:admin" "$HOMEBREW_REPOSITORY"
+ if [ $HOMEBREW_PREFIX != $HOMEBREW_REPOSITORY ]; then
+ ln -sf "$HOMEBREW_REPOSITORY/bin/brew" "$HOMEBREW_PREFIX/bin/brew"
+ fi
-if [ $HOMEBREW_PREFIX != $HOMEBREW_REPOSITORY ]; then
- ln -sf "$HOMEBREW_REPOSITORY/bin/brew" "$HOMEBREW_PREFIX/bin/brew"
+ # Download Homebrew.
+ export GIT_DIR="$HOMEBREW_REPOSITORY/.git" GIT_WORK_TREE="$HOMEBREW_REPOSITORY"
+ git init $Q
+ git config remote.origin.url "https://github.com/Homebrew/brew"
+ git config remote.origin.fetch "+refs/heads/*:refs/remotes/origin/*"
+ git fetch $Q --tags --force
+ git reset $Q --hard origin/master
+ unset GIT_DIR GIT_WORK_TREE
+ logk
+else
+ logskip "Workbrew is already installed so not trying to install Homebrew."
fi
-# Download Homebrew.
-export GIT_DIR="$HOMEBREW_REPOSITORY/.git" GIT_WORK_TREE="$HOMEBREW_REPOSITORY"
-git init $Q
-git config remote.origin.url "https://github.com/Homebrew/brew"
-git config remote.origin.fetch "+refs/heads/*:refs/remotes/origin/*"
-git fetch $Q --tags --force
-git reset $Q --hard origin/master
-unset GIT_DIR GIT_WORK_TREE
-logk
-
# Update Homebrew.
export PATH="$HOMEBREW_PREFIX/bin:$PATH"
-logn "Updating Homebrew:"
+log "Updating Homebrew:"
brew update --quiet
logk
@@ -391,70 +335,34 @@ else
fi
# Setup dotfiles
-if [ -n "$STRAP_GITHUB_USER" ]; then
- DOTFILES_URL="https://github.com/$STRAP_GITHUB_USER/dotfiles"
-
- if git ls-remote "$DOTFILES_URL" &>/dev/null; then
- log "Fetching $STRAP_GITHUB_USER/dotfiles from GitHub:"
- if [ ! -d "$HOME/.dotfiles" ]; then
- log "Cloning to ~/.dotfiles:"
- git clone $Q "$DOTFILES_URL" ~/.dotfiles
- else
- (
- cd ~/.dotfiles
- git pull $Q --rebase --autostash
- )
- fi
- run_dotfile_scripts script/setup script/bootstrap
- logk
- fi
+if [ -d "$HOME/.dotfiles/.git" ]; then
+ logn "Updating ~/.dotfiles:"
+ (
+ cd ~/.dotfiles
+ git pull $Q --rebase --autostash
+ )
+ logk
+ run_dotfile_scripts script/setup script/bootstrap
fi
# Setup Brewfile
-if [ -n "$STRAP_GITHUB_USER" ] && { [ ! -f "$HOME/.Brewfile" ] || [ "$HOME/.Brewfile" -ef "$HOME/.homebrew-brewfile/Brewfile" ]; }; then
- HOMEBREW_BREWFILE_URL="https://github.com/$STRAP_GITHUB_USER/homebrew-brewfile"
-
- if git ls-remote "$HOMEBREW_BREWFILE_URL" &>/dev/null; then
- log "Fetching $STRAP_GITHUB_USER/homebrew-brewfile from GitHub:"
- if [ ! -d "$HOME/.homebrew-brewfile" ]; then
- log "Cloning to ~/.homebrew-brewfile:"
- git clone $Q "$HOMEBREW_BREWFILE_URL" ~/.homebrew-brewfile
- logk
- else
- (
- cd ~/.homebrew-brewfile
- git pull $Q
- )
- fi
- ln -sf ~/.homebrew-brewfile/Brewfile ~/.Brewfile
- logk
- fi
+if [ -d "$HOME/.homebrew-brewfile/.git" ]; then
+ log "Updating ~/.homebrew-brewfile:"
+ (
+ cd ~/.homebrew-brewfile
+ git pull $Q
+ )
+ ln -sf ~/.homebrew-brewfile/Brewfile ~/.Brewfile
+ logk
fi
# Install from local Brewfile
if [ -f "$HOME/.Brewfile" ]; then
- log "Installing from user Brewfile on GitHub:"
+ log "Installing from ~/.Brewfile:"
brew bundle check --global &>/dev/null || brew bundle --global
logk
fi
-# Tap a custom Homebrew tap
-if [ -n "$CUSTOM_HOMEBREW_TAP" ]; then
- read -ra CUSTOM_HOMEBREW_TAP <<<"$CUSTOM_HOMEBREW_TAP"
- log "Running 'brew tap ${CUSTOM_HOMEBREW_TAP[*]}':"
- brew tap "${CUSTOM_HOMEBREW_TAP[@]}"
- logk
-fi
-
-# Run a custom `brew` command
-if [ -n "$CUSTOM_BREW_COMMAND" ]; then
- log "Executing 'brew $CUSTOM_BREW_COMMAND':"
- # Want to expand even if empty or multiple arguments
- # shellcheck disable=SC2086
- brew $CUSTOM_BREW_COMMAND
- logk
-fi
-
# Run post-install dotfiles script
run_dotfile_scripts script/strap-after-setup
diff --git a/web/app.rb b/web/app.rb
deleted file mode 100644
index f86c9ce96..000000000
--- a/web/app.rb
+++ /dev/null
@@ -1,189 +0,0 @@
-# frozen_string_literal: true
-
-require "sinatra"
-require "omniauth-github"
-require "octokit"
-require "rack/protection"
-require "active_support/core_ext/object/blank"
-
-# Don't worry: these credentials are not sensitive but just use for
-# "Strap (development)" with the URL and callback both set to localhost.
-GITHUB_KEY = ENV.fetch("GITHUB_KEY", "b28d0c47b8925e999e49")
-GITHUB_SECRET = ENV.fetch("GITHUB_SECRET", "037ac891e2e0b8bc91558d5ff358d2ff4fa1beb7")
-
-SESSION_SECRET = ENV.fetch("SESSION_SECRET")
-STRAP_ISSUES_URL = ENV.fetch("STRAP_ISSUES_URL", nil)
-STRAP_BEFORE_INSTALL = ENV.fetch("STRAP_BEFORE_INSTALL", nil)
-CUSTOM_HOMEBREW_TAP = ENV.fetch("CUSTOM_HOMEBREW_TAP", nil)
-CUSTOM_BREW_COMMAND = ENV.fetch("CUSTOM_BREW_COMMAND", nil)
-OMNIAUTH_FULL_HOST = ENV.fetch("OMNIAUTH_FULL_HOST", nil)
-RACK_ENV = ENV.fetch("RACK_ENV", nil)
-
-# In some configurations, the full host may need to be set to something other
-# than the canonical URL.
-if OMNIAUTH_FULL_HOST
- OmniAuth.config.full_host = OMNIAUTH_FULL_HOST
-
- # For some reason this needs to be a no-op when using OMNIAUTH_FULL_HOST
- OmniAuth.config.request_validation_phase = nil
-end
-
-set :sessions, secret: SESSION_SECRET
-
-use OmniAuth::Builder do
- options = {
- # access is given for gh cli, packages, git client setup and repo checkouts
- scope: "user:email, repo, workflow, write:packages, read:packages, read:org, read:discussions",
- allow_signup: false,
- }
- options[:provider_ignores_state] = true if RACK_ENV == "development"
- provider :github, GITHUB_KEY, GITHUB_SECRET, options
-end
-
-use Rack::Protection, use: %i[authenticity_token cookie_tossing form_token
- remote_referrer strict_transport]
-
-get "/auth/github/callback" do
- auth = request.env["omniauth.auth"]
-
- session[:auth] = {
- "info" => auth["info"],
- "credentials" => auth["credentials"],
- }
-
- redirect to "/"
-end
-
-get "/" do
- before_install_list_item = "strap.sh script"
-
- if session[:auth].present?
- login_step = "You authorized Strap on GitHub ✅"
- download_button_or_text = <<~HTML
-
- #{download_button_text}
-
- HTML
- view_link_text = "view it in your browser"
- else
- csrf = request.env["rack.session"]["csrf"]
- login_step = <<~HTML
-
- HTML
- download_button_or_text = download_button_text
- view_link_text = "view the uncustomised version in your browser"
- end
-
- @title = "👢 Strap"
- @text = <<~HTML
- To Strap your system:
- -
- #{before_install_list_item}
-
-
- - #{login_step} - - -
- - #{download_button_or_text} - that's been customised for your GitHub user (or - - #{view_link_text} - - first). - - -
-
- Run Strap in Terminal.app with
bash ~/Downloads/strap.sh. -
-
- -
- If something failed, run Strap with more debugging output in
- Terminal.app with
bash ~/Downloads/strap.sh --debugand - #{debugging_text}. -
-
- -
- Delete the customised
strap.sh(it has a GitHub token - in it) in Terminal.app with -rm -f ~/Downloads/strap.sh-
-
- -
- Install additional software with
-
brew install. -
-
-
-
- <%# Spacer to avoid bottom navbar overlapping. %>
-
-
-
- - Strap is a script to bootstrap a minimal macOS development system. - This does not assume you're doing Ruby/Rails/web development but installs the minimal set of software every macOS developer will want. -
- <%= @text %> -- If you like Strap, you'll love - - ☕️ Workbrew - . -
-
- In 2023 I started a company, Workbrew, to provide the missing features and support for companies using Homebrew.
-
- Workbrew is now available in private beta.
-
- It provides MDM integration, fleet configuration and remote brew command execution.
-
- All our customers get hands-on bespoke support from the longest-running Homebrew maintainer (me,
- Mike McQuaid!).
-
- Please get in touch or
- book a demo.
-
-
-
-
-
-