Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

fix: jans-linux-setup install dependencies without interaction if --download-exit #2546

Merged
merged 1 commit into from
Oct 5, 2022
Merged

fix: jans-linux-setup install dependencies without interaction if --download-exit #2546

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions jans-linux-setup/jans_setup/install.py
View file
Open in desktop
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
View file
Open in desktop
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