diff --git a/slpkg/main.py b/slpkg/main.py index e5ccb24b..dc5035e6 100644 --- a/slpkg/main.py +++ b/slpkg/main.py @@ -22,6 +22,7 @@ from slpkg.views.views import ViewMessage from slpkg.form_configs import FormConfigs from slpkg.views.help_commands import Help from slpkg.repositories import Repositories +from slpkg.binaries.install import Packages from slpkg.check_updates import CheckUpdates from slpkg.find_installed import FindInstalled from slpkg.views.view_package import ViewPackage @@ -29,8 +30,6 @@ from slpkg.remove_packages import RemovePackages from slpkg.clean_logs import CleanLogsDependencies from slpkg.update_repository import UpdateRepository -from slpkg.binaries.install import Packages - class Argparse(Configs): @@ -52,11 +51,6 @@ class Argparse(Configs): self.bred: str = f'{self.bold}{self.red}' self.binary_repo = None - self.file_pattern: str = f'*{self.repos.repo_tag}' - - if self.file_pattern_conf: - self.file_pattern = self.file_pattern_conf - if len(self.args) == 0 or '' in self.args: self.usage.help_short(1) @@ -583,13 +577,15 @@ class Argparse(Configs): if self.utils.is_option(self.flag_searches, self.flags): packages: list = self.choose_packages(packages, command) - self.check.exists_in_the_database(packages) - if self.utils.is_option([self.flag_binary, self.flag_short_binary], self.flags): - install = Packages(packages, self.flags, self.file_pattern, mode=command) + self.check.exists_in_the_database(packages, self.binary_repo) + + install = Packages(packages, self.flags, self.file_pattern, self.binary_repo, mode=command) install.execute() else: + self.check.exists_in_the_database(packages) self.check.is_package_unsupported(packages) + install = Slackbuilds(packages, self.flags, self.file_pattern, mode=command) install.execute() raise SystemExit()