Skip to content

Commit

Permalink
fix: jans-linux-setup downloads dependencies without interaction in c…
Browse files Browse the repository at this point in the history
…ase -n (#2546)
  • Loading branch information
devrimyatar committed Oct 5, 2022
1 parent ce2bc3f commit d53f9a2
Show file tree
Hide file tree
Showing 2 changed files with 6 additions and 6 deletions.
4 changes: 2 additions & 2 deletions jans-linux-setup/jans_setup/install.py
Original file line number Diff line number Diff line change
Expand Up @@ -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():
Expand Down Expand Up @@ -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):
Expand Down
8 changes: 4 additions & 4 deletions jans-linux-setup/jans_setup/jans_setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down

0 comments on commit d53f9a2

Please sign in to comment.