Skip to content

feat: Intel MacとApple Siliconの両方に対応 #46

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
dev-satoshi merged 1 commit into from
Aug 15, 2026
Merged

feat: Intel MacとApple Siliconの両方に対応 #46

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 8 additions & 1 deletion scripts/setup/android_setup.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,13 @@ echo "「Android」のセットアップを開始しました"
# SDK 全体を指すディレクトリ（IDE からはこっちを見せる）
SDK_ROOT="$HOME/Library/Android/sdk"

# エミュレータのシステムイメージ（Apple Silicon: arm64-v8a、Intel: x86_64）
if [ "$(uname -m)" = "arm64" ]; then
SYSTEM_IMAGE_ABI="arm64-v8a"
else
SYSTEM_IMAGE_ABI="x86_64"
fi

# Homebrew 版の sdkmanager が使えるか確認
if ! command -v sdkmanager >/dev/null; then
echo "ERROR: sdkmanager が見つかりません。PATH を確認してください。" >&2
Expand All @@ -17,7 +24,7 @@ sdkmanager --sdk_root="$SDK_ROOT" \
"cmdline-tools;latest" \
"platform-tools" \
"platforms;android-35" \
"system-images;android-35;google_apis_playstore;arm64-v8a" \
"system-images;android-35;google_apis_playstore;$SYSTEM_IMAGE_ABI" \
"build-tools;35.0.1" \
"build-tools;36.0.0" \
"sources;android-35" \
Expand Down
9 changes: 8 additions & 1 deletion scripts/setup/link_dotfiles.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,13 @@ echo "「シンボリックリンク」の作成を開始しました"

DOTFILES_DIR="$HOME/dotfiles"

# Homebrewのインストール先（Apple Silicon: /opt/homebrew、Intel: /usr/local）
if [ "$(uname -m)" = "arm64" ]; then
BREW_PREFIX="/opt/homebrew"
else
BREW_PREFIX="/usr/local"
fi

# リンクを作成するファイル一覧（キー：シンボリックリンク先、値：dotfiles内の実ファイル）
LINKS=(
"$DOTFILES_DIR/zsh/.zshrc:$HOME/.zshrc"
Expand All @@ -19,7 +26,7 @@ LINKS=(
"$DOTFILES_DIR/claude/settings.json:$HOME/.claude/settings.json"
"$DOTFILES_DIR/claude/statusline-command.sh:$HOME/.claude/statusline-command.sh"
"$DOTFILES_DIR/android/sdk:$HOME/Library/Android/sdk"
"/opt/homebrew/share/android-commandlinetools/cmdline-tools/latest:$HOME/Library/Android/sdk/cmdline-tools/latest"
"$BREW_PREFIX/share/android-commandlinetools/cmdline-tools/latest:$HOME/Library/Android/sdk/cmdline-tools/latest"
)

# すべてのリンクを作成
Expand Down
8 changes: 6 additions & 2 deletions zsh/.zshenv
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,9 @@
# Homebrew
eval "$(/opt/homebrew/bin/brew shellenv)"
# Homebrew（Apple Silicon: /opt/homebrew、Intel: /usr/local）
if [ -x /opt/homebrew/bin/brew ]; then
eval "$(/opt/homebrew/bin/brew shellenv)"
elif [ -x /usr/local/bin/brew ]; then
eval "$(/usr/local/bin/brew shellenv)"
fi

# OrbStack
source ~/.orbstack/shell/init.zsh 2>/dev/null || :
Loading