Merge pull request #67 from HPCNow/main

froster v0.12.26

Author: victormachadoperez

Diff for: install.sh

@@ -254,6 +254,33 @@ install_froster() {
     fi
 
     echo "...froster installed"
+
+    which froster
+}
+
+get_froster_dir() {
+    local froster_dir
+
+    if [ -f "${XDG_DATA_HOME}/pipx/venvs/froster/bin/froster" ]; then
+        froster_dir=$(dirname "$(readlink -f "${XDG_DATA_HOME}/pipx/venvs/froster/bin/froster")")
+
+    elif [ -f "${HOME}/.local/pipx/venvs/froster/bin/froster" ]; then
+        froster_dir=$(dirname "$(readlink -f "${HOME}/.local/pipx/venvs/froster/bin/froster")")
+
+    elif [ -f "${PIPX_HOME}/venvs/froster/bin/froster" ]; then
+        froster_dir=$(dirname "$(readlink -f "${PIPX_HOME}/venvs/froster/bin/froster")")
+        
+    elif [ -f "${HOME}/.local/bin/froster" ]; then
+        froster_dir=$(dirname "$(readlink -f "${HOME}/.local/bin/froster")")
+
+    elif [ -f "/usr/local/bin/froster" ]; then
+        froster_dir=$(dirname "$(readlink -f "/usr/local/bin/froster")")
+    else
+        echo "Error: pipx installation path not found." >&2
+        return 1
+    fi
+
+    echo "$froster_dir"
 }
 
 install_pwalk() {
@@ -281,7 +308,7 @@ install_pwalk() {
 
     # Move pwalk to froster's binaries folder
     echo "    Moving pwalk to froster's binaries folder"
-    froster_dir=$(dirname $(readlink -f ~/.local/bin/froster))
+    froster_dir=$(get_froster_dir)
     mv ${pwalk_path}/pwalk ${froster_dir}/pwalk >/dev/null 2>&1
 
     # Delete downloaded pwalk files
@@ -327,7 +354,7 @@ install_rclone() {
 
     # Move rclone to froster's binaries folder
     echo "    Moving rclone to froster's binaries folder"
-    froster_dir=$(dirname $(readlink -f ~/.local/bin/froster))
+    froster_dir=$(get_froster_dir)
     mv rclone-v*/rclone ${froster_dir}/rclone >/dev/null 2>&1
 
 
@@ -361,7 +388,8 @@ install_pwalk
 install_rclone
 
 # Get the installed froster version
-version=$(froster -v | awk '{print $2}')
+froster_dir=$(get_froster_dir)
+version=$(${froster_dir}/froster -v | awk '{print $2}')
 
 # Print success message
 echo

Diff for: pyproject.toml

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