@@ -18,36 +18,43 @@ function _pip_install() {
18
18
_HERE=$( dirname ${BASH_SOURCE:- $0 } )
19
19
. $_HERE /utils.sh
20
20
_VENV_PATH=$( mktemp -d)
21
+ echo " Installing $2 using pip..."
21
22
createvirtualenv $( find_python3) $_VENV_PATH
22
23
python -m pip install $1
23
24
ln -s $( which $2 ) $_BIN_DIR /$2
25
+ echo " Installing $2 using pip... done."
24
26
}
25
27
26
- _CURL_ARGS=" --tlsv1.2 -LsSf"
28
+ function _curl() {
29
+ curl --tlsv1.2 -LsSf $1
30
+ }
27
31
28
32
# Install just.
29
33
if ! command -v just 2> /dev/null; then
34
+ _TARGET=" "
30
35
if [ " Windows_NT" = " ${OS:- } " ]; then
31
36
_TARGET=" --target x86_64-pc-windows-msvc"
32
- else
33
- _TARGET=" "
34
37
fi
35
38
# On most systems we can install directly.
36
- curl $_CURL_ARGS https://just.systems/install.sh | bash -s -- $_TARGET --to " $_BIN_DIR " || {
39
+ echo " Installing just..."
40
+ _curl https://just.systems/install.sh | bash -s -- $_TARGET --to " $_BIN_DIR " || {
37
41
_pip_install rust-just just
38
42
}
39
43
if ! command -v just 2> /dev/null; then
40
44
export PATH=" $PATH :$_BIN_DIR "
41
45
fi
46
+ echo " Installing just... done."
42
47
fi
43
48
44
49
# Install uv.
45
50
if ! command -v uv 2> /dev/null; then
51
+ echo " Installing uv..."
46
52
# On most systems we can install directly.
47
- curl $_CURL_ARGS https://astral.sh/uv/install.sh | env UV_INSTALL_DIR=" $_BIN_DIR " INSTALLER_NO_MODIFY_PATH=1 sh || {
53
+ _curl https://astral.sh/uv/install.sh | env UV_INSTALL_DIR=" $_BIN_DIR " INSTALLER_NO_MODIFY_PATH=1 sh || {
48
54
_pip_install uv uv
49
55
}
50
56
if ! command -v uv 2> /dev/null; then
51
57
export PATH=" $PATH :$_BIN_DIR "
52
58
fi
59
+ echo " Installing uv... done."
53
60
fi
0 commit comments