Skip to content

Commit 63d486f

Browse files
Merge pull request #57 from HPCNow/main
Update prints version installed and "froster update" available even if froster not configured
2 parents 638e2c6 + 33ce8ee commit 63d486f

File tree

3 files changed

+11
-4
lines changed

3 files changed

+11
-4
lines changed

Diff for: froster/froster.py

+4-2
Original file line numberDiff line numberDiff line change
@@ -6471,7 +6471,9 @@ def compare_versions(version1, version2):
64716471
current = pkg_resources.get_distribution("froster").version
64726472

64736473
if compare_versions(latest, current) > 0:
6474-
print(f'\nA froster update is available: froster v{latest}')
6474+
print(f'\nA froster update is available!')
6475+
print(f' Current version: froster v{current}')
6476+
print(f' Latest version: froster v{latest}')
64756477
print(f'\nYou can update froster using the command:')
64766478
print(
64776479
f' curl -s https://raw.githubusercontent.com/dirkpetersen/froster/main/install.sh?$(date +%s) | bash\n')
@@ -6939,7 +6941,7 @@ def main():
69396941
cfg.assure_permissions_and_group(cfg.shared_dir)
69406942

69416943
# Do not allow other commands rather than config if the configuration is not set
6942-
if not cfg.configuration_done and args.subcmd not in ['config', 'cnf']:
6944+
if not cfg.configuration_done and args.subcmd not in ['config', 'cnf'] and args.subcmd not in ['update', 'upd']:
69436945
print('\nWARNING: Froster is not full configured yet:')
69446946
print(f' user: {"done" if cfg.user_init else "pending"}')
69456947
print(f' aws: {"done" if cfg.aws_init else "pending"}')

Diff for: install.sh

+6-1
Original file line numberDiff line numberDiff line change
@@ -377,9 +377,14 @@ install_pwalk
377377
# Install rclone
378378
install_rclone
379379

380+
# Get the installed froster version
381+
version=$(pipx runpip froster show froster | grep Version | awk '{print $2}')
382+
383+
# Print success message
380384
echo
381-
echo "Installation complete!"
385+
echo "froster v$version has been successfully installed!"
382386

387+
# Print post-installation instructions
383388
echo
384389
echo "You will need to open a new terminal or refresh your current terminal session by running command:"
385390
echo " source ~/.bashrc"

Diff for: pyproject.toml

+1-1
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.12.11"
7+
version = "0.12.12"
88
description = "Froster is a tool for easy data transfer between local file systems and AWS S3 storage."
99
authors = ["Victor Machado <[email protected]>"]
1010
readme = "README.md"

0 commit comments

Comments
 (0)