Merge pull request dirkpetersen#101 from HPCNow/main

froster v0.14.15

Author: macheitor

README.md

@@ -16,9 +16,9 @@ sudo apt install -y curl python3 python3-pip python3-venv python3-dev gcc lib32g
 ### On Fedora / CentOS / RHEL
 
 ```
-sudo dnf update
+sudo dnf update -y
 sudo dnf groupinstall -y "Development Tools"
-sudo dnf install -y curl python3 python3-pip python3-venv python3-devel unzip fuse3
+sudo dnf install -y curl python3 python3-pip python3-devel unzip fuse3
 ```
 
 ### On HPC machine

install.sh

@@ -27,10 +27,10 @@ catch() {
         echo "Rolling back installation..."
 
         pipx_path=$(get_dir "pipx")
-        ${pipx_path}/pipx ensurepath
+        ${pipx_path}/pipx ensurepath >/dev/null 2>&1
 
         if ${pipx_path}/pipx list | grep 'froster' >/dev/null 2>&1; then
-            ${pipx_path}/pipx uninstall froster
+            ${pipx_path}/pipx uninstall froster >/dev/null 2>&1
         fi
 
         # Restore (if any) backed up froster config files
@@ -294,18 +294,25 @@ install_pipx() {
     if [[ -z $(command -v pipx) ]]; then
 
         # Install or upgrade pipx
-        python3 -m pip install --user --upgrade pipx
+        python3 -m pip install --user --upgrade pipx >/dev/null 2>&1
 
         # Ensure path for pipx
         pipx_path=$(get_dir "pipx")
-        ${pipx_path}/pipx ensurepath
+        ${pipx_path}/pipx ensurepath >/dev/null 2>&1
 
         # Ensure  ~/.local/bin is in the PATH for this session
         export PATH="$HOME/.local/bin:$PATH"
 
         echo "...pipx installed"
     else
         echo "...pipx already installed"
+        echo
+        echo "Upgrading pipx..."
+        
+        pipx upgrade pipx &
+        spinner $!
+
+        echo "...pipx upgraded"
     fi
 }
 
@@ -316,11 +323,11 @@ install_froster() {
 
     if [ "$LOCAL_INSTALL" = "true" ]; then
         echo "  Installing from the current directory"
-        pipx install . 
+        pipx install . >/dev/null 2>&1 &
         spinner $!
     else
         echo "  Installing from PyPi package repository"
-        pipx install froster
+        pipx install froster >/dev/null 2>&1 &
         spinner $!
     fi
 
@@ -355,15 +362,15 @@ get_dir() {
     elif [ -f "${HOME}/.local/pipx/venvs/$1/bin/$1" ]; then
         dir=$(dirname "$(readlink -f "${HOME}/.local/pipx/venvs/$1/bin/$1")")
 
-    elif [ -f "${HOME}/.local/share/pipx/venvs/$1/bin/$1" ]; then
-        dir=$(dirname "$(readlink -f "${HOME}/.local/share/pipx/venvs/$1/bin/$1")")
-
     elif [ -f "${PIPX_HOME}/venvs/$1/bin/$1" ]; then
         dir=$(dirname "$(readlink -f "${PIPX_HOME}/venvs/$1/bin/$1")")
 
     elif [ -f "${HOME}/.local/bin/$1" ]; then
         dir=$(dirname "$(readlink -f "${HOME}/.local/bin/$1")")
 
+    elif [ -f "${HOME}/.local/share/pipx/venvs/$1/bin/$1" ]; then
+        dir=$(dirname "$(readlink -f "${HOME}/.local/share/pipx/venvs/$1/bin/$1")")
+
     elif [ -f "/usr/local/bin/$1" ]; then
         dir=$(dirname "$(readlink -f "/usr/local/bin/$1")")
 

pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "poetry.core.masonry.api"
 
 [tool.poetry]
 name = "froster"
-version = "0.14.14"
+version = "0.14.15"
 description = "Froster is a tool for easy data transfer between local file systems and AWS S3 storage."
 authors = ["Victor Machado <victor.machado@hpcnow.com>"]
 readme = "README.md"