Macの自動設定

Author: taiyodayo

mac/setup_misc.sh

@@ -3,11 +3,11 @@ set -euo pipefail
 
 # setup brew for macs
 if [ "$(uname)" = "Darwin" ] && [ ! -f /usr/local/bin/brew ]; then
-    /usr/bin/ruby -e "$(curl -fsSL https://raw.githubusercontent.com/Homebrew/install/master/install)"
+    /bin/bash -c "$(curl -fsSL https://raw.githubusercontent.com/Homebrew/install/HEAD/install.sh)"
 fi
 
-cat brew_list.txt | xargs brew install
-cat brew_cask.txt | xargs brew install --cask
+cat "$SCRIPT_DIR/mac/brew_list.txt" | xargs brew install
+cat "$SCRIPT_DIR/mac/brew_cask.txt" | xargs brew install --cask
 
 # java使わんからなぁ
 # setup sdkman for java

setup_mac_all.sh

@@ -1,8 +1,25 @@
 #!/usr/bin/env bash
-cp ~/.zshrc ~/.zshrc.bak
+#!/bin/bash
+
+# Backup .zshrc if it exists
+if [ -f ~/.zshrc ]; then
+    cp ~/.zshrc ~/.zshrc.bak
+    echo "Backed up existing .zshrc"
+fi
+
+# Copy new .zshrc
 cp -f _zshrc ~/.zshrc
-cp ~/.p10k.zsh ~/.p10k.zsh.bak
+echo "Copied new .zshrc"
+
+# Backup .p10k.zsh if it exists
+if [ -f ~/.p10k.zsh ]; then
+    cp ~/.p10k.zsh ~/.p10k.zsh.bak
+    echo "Backed up existing .p10k.zsh"
+fi
+
+# Copy new .p10k.zsh
 cp -f _p10k.zsh ~/.p10k.zsh
+echo "Copied new .p10k.zsh"
 
 # copy pub key
 mkdir -p ~/.ssh/