From 8a944416954323146a9b61f2696276349142bde9 Mon Sep 17 00:00:00 2001 From: Junya Okabe Date: Sat, 25 Mar 2023 03:13:07 +0900 Subject: [PATCH 1/3] brew bundle install --- init/brew.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/init/brew.sh b/init/brew.sh index 59a100b..8ee6bf5 100755 --- a/init/brew.sh +++ b/init/brew.sh @@ -1,6 +1,6 @@ echo "brew bundle ..." -eval "brew bundle --file Brewfile > /dev/null 2>&1" +eval "brew bundle install --file Brewfile > /dev/null 2>&1" echo "brew bundle done" exit 0 From 1a147c063ab084f5fbe67bb42a1d836a2acd8dfe Mon Sep 17 00:00:00 2001 From: Junya Okabe Date: Sat, 25 Mar 2023 03:18:51 +0900 Subject: [PATCH 2/3] =?UTF-8?q?fix:=20=E3=83=91=E3=82=B9=E3=81=AE=E8=A8=AD?= =?UTF-8?q?=E5=AE=9A?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- init/brew.sh | 16 +++++++++++++++- 1 file changed, 15 insertions(+), 1 deletion(-) diff --git a/init/brew.sh b/init/brew.sh index 8ee6bf5..7bc2b84 100755 --- a/init/brew.sh +++ b/init/brew.sh @@ -1,6 +1,20 @@ echo "brew bundle ..." +# パスを通す +ARCH=$(uname -m) +if [ "$ARCH" = "arm64" ]; then + PR_ARCH="ARM" + export BREWx86_BASE=/opt/brew_x86 + export BREW_BASE=/opt/homebrew + export PATH=${BREWx86_BASE}/bin:${BREWx86_BASE}/sbin${PATH:+:${PATH}} + export PATH=${BREW_BASE}/bin:${BREW_BASE}/sbin${PATH:+:${PATH}} +else + PR_ARCH="x86" + export BREW_BASE=/opt/brew_x86 + # export PATH=${BREW_BASE}/bin:${BREW_BASE}/sbin${PATH:+:${PATH}} + export PATH=${PATH//¥/homebrew¥//¥/brew_x86¥/} +fi + eval "brew bundle install --file Brewfile > /dev/null 2>&1" echo "brew bundle done" -exit 0 From ae6c1a567143717d2fa9439de24a081d894035c1 Mon Sep 17 00:00:00 2001 From: Junya Okabe Date: Sat, 25 Mar 2023 03:21:43 +0900 Subject: [PATCH 3/3] =?UTF-8?q?fix:=20reviewdog=E3=81=8B=E3=82=89=E3=81=AE?= =?UTF-8?q?=E6=80=92=E3=82=89=E3=82=8C=E3=82=92=E5=89=8A=E9=99=A4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .zsh/init/zshenv/arch.zsh | 1 - 1 file changed, 1 deletion(-) diff --git a/.zsh/init/zshenv/arch.zsh b/.zsh/init/zshenv/arch.zsh index c097edb..ce5f044 100644 --- a/.zsh/init/zshenv/arch.zsh +++ b/.zsh/init/zshenv/arch.zsh @@ -7,7 +7,6 @@ if [ "$ARCH" = "arm64" ]; then export PATH=${BREWx86_BASE}/bin:${BREWx86_BASE}/sbin${PATH:+:${PATH}} export PATH=${BREW_BASE}/bin:${BREW_BASE}/sbin${PATH:+:${PATH}} else - PR_ARCH="x86" export BREW_BASE=/opt/brew_x86 # export PATH=${BREW_BASE}/bin:${BREW_BASE}/sbin${PATH:+:${PATH}} export PATH=${PATH//¥/homebrew¥//¥/brew_x86¥/}