From 4a53bd737e0e974aa265ae1e6058ac3661fd3ec4 Mon Sep 17 00:00:00 2001 From: JesseBot Date: Mon, 7 Nov 2022 15:37:01 +0100 Subject: [PATCH] Fix snap/flatpak installs (#61) * this should fix autoflake stuff * fixing when to install package from package group to include if not packages installed at all * ticking up version --- onboardme/config/packages.yml | 2 ++ onboardme/pkg_management.py | 5 ++--- setup.py | 2 +- 3 files changed, 5 insertions(+), 4 deletions(-) diff --git a/onboardme/config/packages.yml b/onboardme/config/packages.yml index fb6800cc..41088d4c 100644 --- a/onboardme/config/packages.yml +++ b/onboardme/config/packages.yml @@ -83,6 +83,8 @@ pip3.10: default: # this is for python development - flake8 + - pyflakes + - autoflake - pip - build - twine diff --git a/onboardme/pkg_management.py b/onboardme/pkg_management.py index 4015bde0..02ce60e7 100755 --- a/onboardme/pkg_management.py +++ b/onboardme/pkg_management.py @@ -119,7 +119,6 @@ def run_pkg_mngrs(pkg_mngrs=[], pkg_groups=[]): if 'cleanup' in pkg_cmds: subproc([pkg_cmds['cleanup']]) sub_header("[b]Cleanup[/b] step Completed.") - # return @@ -134,12 +133,12 @@ def install_pkg_group(installed_pkgs=[], pkgs_to_install=[], install_cmd=""): if 'sudo' in install_cmd: SPINNER = False - if 'upgrade' in install_cmd: + if 'upgrade' in install_cmd or not installed_pkgs: install_pkg = True for pkg in pkgs_to_install: if installed_pkgs: - if pkg in installed_pkgs: + if pkg not in installed_pkgs: install_pkg = True if install_pkg: subproc([install_cmd + pkg], quiet=True, spinner=SPINNER) diff --git a/setup.py b/setup.py index 2fbea2af..29557ee3 100644 --- a/setup.py +++ b/setup.py @@ -25,7 +25,7 @@ def readme(): lic_class], python_requires='>3.10', keywords='onboardme, onboarding, desktop-setup, setuptools, development', - version='0.14.13', + version='0.14.14', project_urls={ 'Documentation': 'https://jessebot.github.io/onboardme/onboardme', 'Source': 'http://github.com/jessebot/onboardme',