Skip to content

Commit 86fa094

Browse files
Fix build. (Shift3#17)
* Uses the new homebrew install method. * Updates old installs by ensuring casks and homebrew are deep clones instead of shallow. * Newer git requires a pull strategy defined in gitconfig * Fedora has podman as a complete replacement for docker, so docker install not necessary.
1 parent ee684d1 commit 86fa094

File tree

3 files changed

+18
-2
lines changed

3 files changed

+18
-2
lines changed

gitconfig

+2
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,8 @@
1111
autocrlf = input
1212
[merge]
1313
ff = only
14+
[pull]
15+
ff = only
1416
[fetch]
1517
prune = true
1618
[rebase]

os/linux

-2
Original file line numberDiff line numberDiff line change
@@ -119,9 +119,7 @@ case $OS in
119119
sudo dnf groupinstall -y "C Development Tools and Libraries"
120120
dnf_add_mongo_repo
121121
sudo dnf -y install $FEDORA_PACKAGES
122-
dnf_add_and_install_docker_ce
123122
fedora_enable_databases_on_restart
124-
systemd_enable_docker_on_restart
125123
;;
126124
Debian)
127125
fancy_echo "Installing packages using apt"

os/mac

+16
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,22 @@ install_homebrew() {
1919
fi
2020
}
2121

22+
fix_previous_homebrew_if_necessary() {
23+
HOMEBREW_LIBRARY=/usr/local/Homebrew/Library
24+
25+
[[ -f "$HOMEBREW_LIBRARY/Taps/homebrew/homebrew-core/.git/shallow" ]] && HOMEBREW_CORE_SHALLOW=1
26+
[[ -f "$HOMEBREW_LIBRARY/Taps/homebrew/homebrew-cask/.git/shallow" ]] && HOMEBREW_CASK_SHALLOW=1
27+
28+
if [[ -n $HOMEBREW_CORE_SHALLOW ]]; then
29+
git -C "/usr/local/Homebrew/Library/Taps/homebrew/homebrew-core" fetch --unshallow
30+
fi
31+
32+
if [[ -n $HOMEBREW_CASK_SHALLOW ]]; then
33+
git -C "/usr/local/Homebrew/Library/Taps/homebrew/homebrew-cask" fetch --unshallow
34+
fi
35+
}
36+
37+
fix_previous_homebrew_if_necessary
2238
install_homebrew
2339

2440
if brew list | grep -Fq brew-cask; then

0 commit comments

Comments
 (0)