@@ -71,37 +71,36 @@ if hash brew 2>/dev/null; then
71
71
if ! hash gawk 2> /dev/null; then
72
72
brew install gawk
73
73
fi
74
+ if ! hash pipx 2> /dev/null; then
75
+ brew install pipx
76
+ fi
74
77
75
78
if ! hash docker 2> /dev/null; then
76
79
rm -rf /usr/local/share/zsh/site-functions/_docker && \
77
80
rm -rf /usr/local/share/fish/vendor_completions.d/docker.fish && \
78
81
rm -rf /usr/local/etc/bash_completion.d/docker
79
82
80
- brew install --cask docker
81
- brew install docker
82
- brew link docker
83
+ brew install --cask docker || true
84
+ brew install docker || true
85
+ brew link docker || true
83
86
fi
84
87
if ! hash docker-compose 2> /dev/null; then
85
- brew install docker-compose
88
+ brew install docker-compose || true
86
89
fi
87
90
if ! hash mkdocs 2> /dev/null; then
88
91
brew install mkdocs
89
92
fi
90
93
if ! hash jq 2> /dev/null; then
91
94
brew install jq
92
95
fi
93
- brew install --quiet --force
[email protected]
94
- curl -O https://bootstrap.pypa.io/get-pip.py
95
- sudo -H python3 get-pip.py --no-warn-script-location
96
-
97
- if [
-f " /usr/local/opt/[email protected] /bin/python3" ]
&& [
-f " /opt/homebrew/opt/[email protected] /bin/python3" ]
; then
98
- python39=/opt/homebrew/opt/
[email protected] /bin/python3
99
- else
100
- python39=$( which python3)
101
- fi
102
- export python39
103
- $python39 -m pip -q install --upgrade pip
104
- $python39 -m pip -q install omegaconf
96
+ # brew install --quiet --force python@3
97
+ # #curl -O https://bootstrap.pypa.io/get-pip.py
98
+ # #sudo -H python3 get-pip.py --no-warn-script-location
99
+
100
+ python3=$( which python3)
101
+ export python3
102
+ pipx ensurepath && \
103
+ pipx install omegaconf --include-deps --force # || $(which python3) -m pip -q install --upgrade pip && $(which python3) -m pip -q install omegaconf ||
105
104
echo
106
105
else
107
106
/bin/bash -c " $( curl -fsSL https://raw.githubusercontent.com/Homebrew/install/master/install.sh) "
@@ -167,6 +166,7 @@ if [[ "$OSTYPE" == "linux"* ]]; then
167
166
fi
168
167
elif [[ " $OSTYPE " == " darwin" * ]]; then
169
168
checkbrew
169
+ echo
170
170
elif [[ " $OSTYPE " == " cygwin" ]]; then
171
171
echo TODO add support for $OSTYPE
172
172
elif [[ " $OSTYPE " == " msys" ]]; then
0 commit comments