From d53f9a2af03e20fcaf5bdac0e71363797ce2f9d3 Mon Sep 17 00:00:00 2001 From: Devrim Date: Wed, 5 Oct 2022 14:55:22 +0300 Subject: [PATCH] fix: jans-linux-setup downloads dependencies without interaction in case -n (#2546) --- jans-linux-setup/jans_setup/install.py | 4 ++-- jans-linux-setup/jans_setup/jans_setup.py | 8 ++++---- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/jans-linux-setup/jans_setup/install.py b/jans-linux-setup/jans_setup/install.py index b83a5dcac1e..e650c63d66e 100755 --- a/jans-linux-setup/jans_setup/install.py +++ b/jans-linux-setup/jans_setup/install.py @@ -75,7 +75,7 @@ def check_install_dependencies(): print("Can't continue...") sys.exit() - os.system('{} install -y {}'.format(package_installer, ' '.join(package_dependencies))) + os.system('{} install -y {}'.format(package_installer, ' '.join(package_dependencies))) def download_jans_acrhieve(): @@ -272,7 +272,7 @@ def do_install(): def main(): - if not argsp.uninstall: + if not argsp.uninstall or argsp.download_exit: check_install_dependencies() if not (argsp.use_downloaded or argsp.uninstall): diff --git a/jans-linux-setup/jans_setup/jans_setup.py b/jans-linux-setup/jans_setup/jans_setup.py index 5ed22013900..f3598a012cf 100755 --- a/jans-linux-setup/jans_setup/jans_setup.py +++ b/jans-linux-setup/jans_setup/jans_setup.py @@ -89,15 +89,15 @@ def ami_packaged(): sys.path.insert(0, base.pylib_dir) -if argsp.download_exit: - downloads.download_all() - sys.exit() - from setup_app.utils.package_utils import packageUtils packageUtils.check_and_install_packages() sys.path.insert(0, os.path.join(base.pylib_dir, 'gcs')) +if argsp.download_exit: + downloads.download_all() + sys.exit() + from setup_app.messages import msg from setup_app.config import Config from setup_app.utils.progress import jansProgress