@@ -27,10 +27,10 @@ catch() {
27
27
echo " Rolling back installation..."
28
28
29
29
pipx_path=$( get_dir " pipx" )
30
- ${pipx_path} /pipx ensurepath
30
+ ${pipx_path} /pipx ensurepath > /dev/null 2>&1
31
31
32
32
if ${pipx_path} /pipx list | grep ' froster' > /dev/null 2>&1 ; then
33
- ${pipx_path} /pipx uninstall froster
33
+ ${pipx_path} /pipx uninstall froster > /dev/null 2>&1
34
34
fi
35
35
36
36
# Restore (if any) backed up froster config files
@@ -294,18 +294,25 @@ install_pipx() {
294
294
if [[ -z $( command -v pipx) ]]; then
295
295
296
296
# Install or upgrade pipx
297
- python3 -m pip install --user --upgrade pipx
297
+ python3 -m pip install --user --upgrade pipx > /dev/null 2>&1
298
298
299
299
# Ensure path for pipx
300
300
pipx_path=$( get_dir " pipx" )
301
- ${pipx_path} /pipx ensurepath
301
+ ${pipx_path} /pipx ensurepath > /dev/null 2>&1
302
302
303
303
# Ensure ~/.local/bin is in the PATH for this session
304
304
export PATH=" $HOME /.local/bin:$PATH "
305
305
306
306
echo " ...pipx installed"
307
307
else
308
308
echo " ...pipx already installed"
309
+ echo
310
+ echo " Upgrading pipx..."
311
+
312
+ pipx upgrade pipx &
313
+ spinner $!
314
+
315
+ echo " ...pipx upgraded"
309
316
fi
310
317
}
311
318
@@ -316,11 +323,11 @@ install_froster() {
316
323
317
324
if [ " $LOCAL_INSTALL " = " true" ]; then
318
325
echo " Installing from the current directory"
319
- pipx install .
326
+ pipx install . > /dev/null 2>&1 &
320
327
spinner $!
321
328
else
322
329
echo " Installing from PyPi package repository"
323
- pipx install froster
330
+ pipx install froster > /dev/null 2>&1 &
324
331
spinner $!
325
332
fi
326
333
@@ -355,15 +362,15 @@ get_dir() {
355
362
elif [ -f " ${HOME} /.local/pipx/venvs/$1 /bin/$1 " ]; then
356
363
dir=$( dirname " $( readlink -f " ${HOME} /.local/pipx/venvs/$1 /bin/$1 " ) " )
357
364
358
- elif [ -f " ${HOME} /.local/share/pipx/venvs/$1 /bin/$1 " ]; then
359
- dir=$( dirname " $( readlink -f " ${HOME} /.local/share/pipx/venvs/$1 /bin/$1 " ) " )
360
-
361
365
elif [ -f " ${PIPX_HOME} /venvs/$1 /bin/$1 " ]; then
362
366
dir=$( dirname " $( readlink -f " ${PIPX_HOME} /venvs/$1 /bin/$1 " ) " )
363
367
364
368
elif [ -f " ${HOME} /.local/bin/$1 " ]; then
365
369
dir=$( dirname " $( readlink -f " ${HOME} /.local/bin/$1 " ) " )
366
370
371
+ elif [ -f " ${HOME} /.local/share/pipx/venvs/$1 /bin/$1 " ]; then
372
+ dir=$( dirname " $( readlink -f " ${HOME} /.local/share/pipx/venvs/$1 /bin/$1 " ) " )
373
+
367
374
elif [ -f " /usr/local/bin/$1 " ]; then
368
375
dir=$( dirname " $( readlink -f " /usr/local/bin/$1 " ) " )
369
376
0 commit comments