Skip to content

Commit edfdb6a

Browse files
committed
Revert "Refactor install.sh and cz"
This reverts commit 7b616e9.
1 parent 7e50b32 commit edfdb6a

3 files changed

Lines changed: 16 additions & 16 deletions

File tree

bin/cz

Lines changed: 10 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,11 @@
11
#!/bin/bash
2-
exec "$(dirname "$0")/run-clean-env" chezmoi "$@"
2+
set -eu
3+
4+
homebrew_dir="/opt/homebrew"
5+
brew="$homebrew_dir/bin/brew"
6+
7+
env -i HOME="$HOME" GITHUB_ACTIONS="${GITHUB_ACTIONS:-}" /bin/bash --noprofile --norc << EOF
8+
eval "\$(/usr/libexec/path_helper -s)"
9+
eval "\$("$brew" shellenv)"
10+
chezmoi "$@"
11+
EOF

bin/run-clean-env

Lines changed: 0 additions & 11 deletions
This file was deleted.

install.sh

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,9 @@ fi
2424

2525
echo "Installing and initializing chezmoi"
2626

27-
"$(dirname "$0")/bin/run-clean-env" bash -c "
28-
HOMEBREW_NO_AUTO_UPDATE=1 brew install chezmoi
29-
chezmoi init --verbose --apply $account
30-
"
27+
env -i HOME="$HOME" GITHUB_ACTIONS="${GITHUB_ACTIONS:-}" /bin/bash --noprofile --norc << EOF
28+
eval "\$(/usr/libexec/path_helper -s)"
29+
eval "\$("$brew" shellenv)"
30+
HOMEBREW_NO_AUTO_UPDATE=1 "$brew" install chezmoi
31+
chezmoi init --verbose --apply $account
32+
EOF

0 commit comments

Comments
 (0)