From 6cfc69a116fd4c49cda96cd0cde17832ff53bf56 Mon Sep 17 00:00:00 2001 From: ViViDboarder Date: Wed, 8 Mar 2023 10:45:39 -0800 Subject: [PATCH] Update Mac setup to install new apps and newer versions --- mac-setup | 11 +++++++++-- recipes/mac-setup/bettertouchtool | 4 ++-- recipes/mac-setup/bitwarden | 2 +- recipes/mac-setup/dash | 5 +++++ recipes/mac-setup/finicky | 5 ++--- recipes/mac-setup/firefox | 8 ++++++++ recipes/mac-setup/iterm2 | 6 ++++++ recipes/mac-setup/macports | 11 +++++++---- recipes/mac-setup/nextcloud | 4 ++-- recipes/mac-setup/textmate | 5 +++++ recipes/mac-setup/yubico_auth | 5 +++++ 11 files changed, 52 insertions(+), 14 deletions(-) create mode 100755 recipes/mac-setup/dash create mode 100755 recipes/mac-setup/firefox create mode 100755 recipes/mac-setup/iterm2 create mode 100755 recipes/mac-setup/textmate create mode 100755 recipes/mac-setup/yubico_auth diff --git a/mac-setup b/mac-setup index 6083c91..e4c4871 100755 --- a/mac-setup +++ b/mac-setup @@ -14,9 +14,16 @@ export PROJECT_DIR init_paths_and_vars +# Require human intervention, do first and get out of the way +install "bitwarden" +install "yubico_auth" +install "nextcloud" install "macports" + +# Automated install "generate_ssh_keys" install "finicky" -install "bitwarden" -install "nextcloud" +install "firefox" install "bettertouchtool" +install "textmate" +install "dash" diff --git a/recipes/mac-setup/bettertouchtool b/recipes/mac-setup/bettertouchtool index 9f511dd..7fb800e 100755 --- a/recipes/mac-setup/bettertouchtool +++ b/recipes/mac-setup/bettertouchtool @@ -1,4 +1,4 @@ #! /bin/bash - +set -e curl -o "$TMP_DIR/BetterTouchTool.zip" "https://folivora.ai/releases/BetterTouchTool.zip" -unzip -d "/Applications" "$TMP_DIR/BetterTouchTool.zip" +unzip -od "/Applications" "$TMP_DIR/BetterTouchTool.zip" \ No newline at end of file diff --git a/recipes/mac-setup/bitwarden b/recipes/mac-setup/bitwarden index 0ea9208..6b290ca 100755 --- a/recipes/mac-setup/bitwarden +++ b/recipes/mac-setup/bitwarden @@ -2,4 +2,4 @@ log "Install bitwarden from App Store" open "https://apps.apple.com/us/app/bitwarden/id1352778147?mt=12" -prompt_any +prompt_any \ No newline at end of file diff --git a/recipes/mac-setup/dash b/recipes/mac-setup/dash new file mode 100755 index 0000000..9a187cf --- /dev/null +++ b/recipes/mac-setup/dash @@ -0,0 +1,5 @@ +#! /bin/bash +VERSION=v6 +FILENAME=Dash.zip +curl --location -o "$TMP_DIR/$FILENAME" "https://sanfrancisco.kapeli.com/downloads/$VERSION/Dash.zip" +unzip -od /Applications/ "$TMP_DIR/$FILENAME" \ No newline at end of file diff --git a/recipes/mac-setup/finicky b/recipes/mac-setup/finicky index 561b5a4..20232b4 100755 --- a/recipes/mac-setup/finicky +++ b/recipes/mac-setup/finicky @@ -1,14 +1,13 @@ #! /bin/bash - set -e VERSION=3.4.0 curl -L -o "$PROJECT_DIR/tmp/Finicky.zip" "https://github.com/johnste/finicky/releases/download/v${VERSION}/Finicky.zip" -unzip -d "$HOME/Applications" "$PROJECT_DIR/tmp/Finicky.zip" +unzip --od "$HOME/Applications" "$PROJECT_DIR/tmp/Finicky.zip" icloud_prefs="$HOME/Library/Mobile Documents/com~apple~CloudDocs/Synced Preferences" if [ -d "$icloud_prefs" ]; then try_link "$icloud_prefs/finicky.js" "$HOME/.finicky.js" -fi +fi \ No newline at end of file diff --git a/recipes/mac-setup/firefox b/recipes/mac-setup/firefox new file mode 100755 index 0000000..f90ac96 --- /dev/null +++ b/recipes/mac-setup/firefox @@ -0,0 +1,8 @@ +#! /bin/bash +set -e + +FILENAME=Firefox-Latest.dmg +curl --location -o "$TMP_DIR/$FILENAME" "https://download.mozilla.org/?product=firefox-latest-ssl&os=osx&lang=en-US" +hdiutil attach "$TMP_DIR/$FILENAME" +cp -r /Volumes/Firefox/Firefox.app /Applications/ +hdiutil detach /Volumes/Firefox \ No newline at end of file diff --git a/recipes/mac-setup/iterm2 b/recipes/mac-setup/iterm2 new file mode 100755 index 0000000..acaeac5 --- /dev/null +++ b/recipes/mac-setup/iterm2 @@ -0,0 +1,6 @@ +#! /bin/bash +VERSION=v6 +FILENAME=Dash.zip +curl --location -o "$TMP_DIR/$FILENAME" "https://iterm2.com/downloads/stable/latest" +unzip "$TMP_DIR/$FILENAME" +mv -f "$TMP_DIR/Dash.app" /Applications/ \ No newline at end of file diff --git a/recipes/mac-setup/macports b/recipes/mac-setup/macports index 0bb0527..88d531e 100755 --- a/recipes/mac-setup/macports +++ b/recipes/mac-setup/macports @@ -1,8 +1,11 @@ #! /bin/bash - -MACPORTS_VERSION=2.7.1 +set -e +MACPORTS_VERSION=2.8.1 MACOS_VERSION=$(sw_vers -productVersion) case $MACOS_VERSION in + 13.*) + MACOS_NAME=13-Ventura + ;; 12.*) MACOS_NAME=12-Monterey ;; @@ -25,7 +28,7 @@ log "Download $INSTALLER_NAME" curl -o "${PROJECT_DIR}/tmp/${INSTALLER_NAME}" -L "https://github.com/macports/macports-base/releases/download/v${MACPORTS_VERSION}/${INSTALLER_NAME}" log "Install xcode tools" -xcode-select --install +xcode-select --install || true log "Run macports installer" -sudo installer -pkg "${PROJECT_DIR}/tmp/${INSTALLER_NAME}" -target / +sudo installer -pkg "${PROJECT_DIR}/tmp/${INSTALLER_NAME}" -target / \ No newline at end of file diff --git a/recipes/mac-setup/nextcloud b/recipes/mac-setup/nextcloud index c183fea..4857cae 100755 --- a/recipes/mac-setup/nextcloud +++ b/recipes/mac-setup/nextcloud @@ -1,6 +1,6 @@ #! /bin/bash -VERSION=3.3.5 +VERSION=3.7.3 FILENAME=Nextcloud-$VERSION.pkg curl -L -o "$TMP_DIR/$FILENAME" "https://github.com/nextcloud/desktop/releases/download/v${VERSION}/$FILENAME" -sudo installer -pkg "$TMP_DIR/$FILENAME" -target / +sudo installer -pkg "$TMP_DIR/$FILENAME" -target / \ No newline at end of file diff --git a/recipes/mac-setup/textmate b/recipes/mac-setup/textmate new file mode 100755 index 0000000..1501573 --- /dev/null +++ b/recipes/mac-setup/textmate @@ -0,0 +1,5 @@ +#! /bin/bash +set -e +FILENAME=TextMate_Latest.tbz +curl --location -o "$TMP_DIR/$FILENAME" "https://api.textmate.org/downloads/release?os=10.12" +tar -xzf "$TMP_DIR/$FILENAME" -C /Applications/ \ No newline at end of file diff --git a/recipes/mac-setup/yubico_auth b/recipes/mac-setup/yubico_auth new file mode 100755 index 0000000..3c2770b --- /dev/null +++ b/recipes/mac-setup/yubico_auth @@ -0,0 +1,5 @@ +#! /bin/bash + +log "Install Yubico Auth from App Store" +open "https://apps.apple.com/us/app/yubico-authenticator/id1497506650?mt=12" +prompt_any \ No newline at end of file