Skip to content

Commit 7e5cce8

Browse files
authored
Merge pull request dirkpetersen#101 from HPCNow/main
froster v0.14.15
2 parents 7710c91 + 0e51aa8 commit 7e5cce8

File tree

3 files changed

+19
-12
lines changed

3 files changed

+19
-12
lines changed

README.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,9 +16,9 @@ sudo apt install -y curl python3 python3-pip python3-venv python3-dev gcc lib32g
1616
### On Fedora / CentOS / RHEL
1717

1818
```
19-
sudo dnf update
19+
sudo dnf update -y
2020
sudo dnf groupinstall -y "Development Tools"
21-
sudo dnf install -y curl python3 python3-pip python3-venv python3-devel unzip fuse3
21+
sudo dnf install -y curl python3 python3-pip python3-devel unzip fuse3
2222
```
2323

2424
### On HPC machine

install.sh

Lines changed: 16 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -27,10 +27,10 @@ catch() {
2727
echo "Rolling back installation..."
2828

2929
pipx_path=$(get_dir "pipx")
30-
${pipx_path}/pipx ensurepath
30+
${pipx_path}/pipx ensurepath >/dev/null 2>&1
3131

3232
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
3434
fi
3535

3636
# Restore (if any) backed up froster config files
@@ -294,18 +294,25 @@ install_pipx() {
294294
if [[ -z $(command -v pipx) ]]; then
295295

296296
# Install or upgrade pipx
297-
python3 -m pip install --user --upgrade pipx
297+
python3 -m pip install --user --upgrade pipx >/dev/null 2>&1
298298

299299
# Ensure path for pipx
300300
pipx_path=$(get_dir "pipx")
301-
${pipx_path}/pipx ensurepath
301+
${pipx_path}/pipx ensurepath >/dev/null 2>&1
302302

303303
# Ensure ~/.local/bin is in the PATH for this session
304304
export PATH="$HOME/.local/bin:$PATH"
305305

306306
echo "...pipx installed"
307307
else
308308
echo "...pipx already installed"
309+
echo
310+
echo "Upgrading pipx..."
311+
312+
pipx upgrade pipx &
313+
spinner $!
314+
315+
echo "...pipx upgraded"
309316
fi
310317
}
311318

@@ -316,11 +323,11 @@ install_froster() {
316323

317324
if [ "$LOCAL_INSTALL" = "true" ]; then
318325
echo " Installing from the current directory"
319-
pipx install .
326+
pipx install . >/dev/null 2>&1 &
320327
spinner $!
321328
else
322329
echo " Installing from PyPi package repository"
323-
pipx install froster
330+
pipx install froster >/dev/null 2>&1 &
324331
spinner $!
325332
fi
326333

@@ -355,15 +362,15 @@ get_dir() {
355362
elif [ -f "${HOME}/.local/pipx/venvs/$1/bin/$1" ]; then
356363
dir=$(dirname "$(readlink -f "${HOME}/.local/pipx/venvs/$1/bin/$1")")
357364

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-
361365
elif [ -f "${PIPX_HOME}/venvs/$1/bin/$1" ]; then
362366
dir=$(dirname "$(readlink -f "${PIPX_HOME}/venvs/$1/bin/$1")")
363367

364368
elif [ -f "${HOME}/.local/bin/$1" ]; then
365369
dir=$(dirname "$(readlink -f "${HOME}/.local/bin/$1")")
366370

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+
367374
elif [ -f "/usr/local/bin/$1" ]; then
368375
dir=$(dirname "$(readlink -f "/usr/local/bin/$1")")
369376

pyproject.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ build-backend = "poetry.core.masonry.api"
44

55
[tool.poetry]
66
name = "froster"
7-
version = "0.14.14"
7+
version = "0.14.15"
88
description = "Froster is a tool for easy data transfer between local file systems and AWS S3 storage."
99
authors = ["Victor Machado <victor.machado@hpcnow.com>"]
1010
readme = "README.md"

0 commit comments

Comments
 (0)