Skip to content

Commit 01d0017

Browse files
committed
fix: remove Brew lockfile references as support for it was removed upstream
See Homebrew/homebrew-bundle#1509 for details.
1 parent b5a5fd6 commit 01d0017

File tree

2 files changed

+17
-26
lines changed

2 files changed

+17
-26
lines changed

.gitignore

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -146,10 +146,6 @@ $RECYCLE.BIN/
146146

147147
### Custom Additions
148148

149-
### Homebrew lockfile
150-
Brewfile.lock.json
151-
152-
153149
### Node template (used by bats)
154150
# Logs
155151
logs

do

Lines changed: 17 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -170,29 +170,24 @@ elif [[ "${args[0]}" == "link" ]]; then
170170
fi
171171

172172
msg ""
173-
msg "Installing Brewfile contents"
174-
if [[ -f "${repository}/Brewfile.lock.json" ]]; then
175-
msg "${YELLOW}A brew bundle lockfile ('${repository}/Brewfile.lock.json') exists, assuming all required tools are installed.${NOFORMAT}"
176-
else
177-
read -rp "Do you want to review the Brewfile now (y/n)? " -n 1
178-
msg ""
179-
if [[ ${REPLY} =~ ^[Yy]$ ]]; then
180-
msg "Brewfile contents:"
181-
msg "---"
182-
echo "$(<"${repository}/Brewfile")"
183-
msg "---"
184-
fi
173+
msg "Installing Brewfile ('${repository}/Brewfile') contents"
174+
read -rp "Do you want to review the Brewfile now (y/n)? " -n 1
175+
msg ""
176+
if [[ ${REPLY} =~ ^[Yy]$ ]]; then
177+
msg "Brewfile contents:"
178+
msg "---"
179+
echo "$(<"${repository}/Brewfile")"
180+
msg "---"
181+
fi
185182

186-
read -rp "Do you want to install the Brewfile contents (y/n)? " -n 1
187-
msg ""
188-
if [[ ${REPLY} =~ ^[Yy]$ ]]; then
189-
# Upgrade any already-installed formulae.
190-
brew upgrade
191-
# Install everything inside Brewfile
192-
brew bundle install --file "${repository}/Brewfile"
193-
else
194-
die "${RED}Aborting. The dotfiles require a number of tools from the Brewfile to work. Please update the Brewfile to your liking and run the installer again.${NOFORMAT}"
195-
fi
183+
msg "${RED}The dotfiles require a number of tools from the Brewfile to work. You can skip installing them here if you are sure everything is already set up as expected.${NOFORMAT}"
184+
read -rp "Do you want to install the Brewfile contents (y/n)? " -n 1
185+
msg ""
186+
if [[ ${REPLY} =~ ^[Yy]$ ]]; then
187+
# Upgrade any already-installed formulae.
188+
brew upgrade
189+
# Install everything inside Brewfile
190+
brew bundle install --file "${repository}/Brewfile"
196191
fi
197192

198193
msg ""

0 commit comments

Comments
 (0)