Merge branch 'develop'

This commit is contained in:
Dimitris Zlatanidis 2020-02-06 16:17:08 +01:00
commit b629cabc24
76 changed files with 129 additions and 108 deletions

View file

@ -1,4 +1,12 @@
3.7.5 - 15/01/2020 3.8.0 - 05/02/2020
Added:
- Many changes happen in this version, a big part of code has been rewritten
- to improve the code for support Python 3. Possibly will there are some bugs
- in the feture versions I would appreciate it if report them.
- Cheers,
- Dimitris
Fixed: Fixed:
- Bugfix: merge files with slack repository between current and slack versions - Bugfix: merge files with slack repository between current and slack versions
Updated: Updated:

View file

@ -22,5 +22,5 @@ There are mainly 3 ways:
2. Download binary package from '`https://sourceforge.net/projects/slpkg/files/binary/`' 2. Download binary package from '`https://sourceforge.net/projects/slpkg/files/binary/`'
and use Slackware command '`upgradepkg --install-new <slpkg binary>`' and use Slackware command '`upgradepkg --install-new <slpkg binary>`'
3. Using pip: '`pip3 install https://gitlab.com/dslackw/slpkg/-/archive/3.7.0/slpkg-3.7.0.tar.gz`' 3. Using pip: '`pip3 install https://gitlab.com/dslackw/slpkg/-/archive/3.8.0/slpkg-3.8.0.tar.gz`'
or instead '`'python3 -m pip install`''. or instead '`'python3 -m pip install`''.

View file

@ -1,4 +1,4 @@
# slpkg 3.7.4 # slpkg 3.8.0
Slpkg is a powerful software package manager that installs, updates, and removes packages on Slpkg is a powerful software package manager that installs, updates, and removes packages on
[Slackware](http://www.slackware.com/) based systems. It automatically computes dependencies and [Slackware](http://www.slackware.com/) based systems. It automatically computes dependencies and

View file

@ -3,7 +3,7 @@
# slpkg file is part of slpkg. # slpkg file is part of slpkg.
# Copyright 2014-2019 Dimitris Zlatanidis <d.zlatanidis@gmail.com> # Copyright 2014-2020 Dimitris Zlatanidis <d.zlatanidis@gmail.com>
# All rights reserved. # All rights reserved.
# Slpkg is a user-friendly package manager for Slackware installations # Slpkg is a user-friendly package manager for Slackware installations

View file

@ -3,7 +3,7 @@
# clean.py file is part of slpkg. # clean.py file is part of slpkg.
# Copyright 2014-2019 Dimitris Zlatanidis <d.zlatanidis@gmail.com> # Copyright 2014-2020 Dimitris Zlatanidis <d.zlatanidis@gmail.com>
# All rights reserved. # All rights reserved.
# Slpkg is a user-friendly package manager for Slackware installations # Slpkg is a user-friendly package manager for Slackware installations

View file

@ -2,7 +2,7 @@
# install.sh file is part of slpkg. # install.sh file is part of slpkg.
# Copyright 2014-2019 Dimitris Zlatanidis <d.zlatanidis@gmail.com> # Copyright 2014-2020 Dimitris Zlatanidis <d.zlatanidis@gmail.com>
# All rights reserved. # All rights reserved.
# #
# Redistribution and use of this script, with or without modification, is # Redistribution and use of this script, with or without modification, is

View file

@ -3,7 +3,7 @@
# setup.py file is part of slpkg. # setup.py file is part of slpkg.
# Copyright 2014-2019 Dimitris Zlatanidis <d.zlatanidis@gmail.com> # Copyright 2014-2020 Dimitris Zlatanidis <d.zlatanidis@gmail.com>
# All rights reserved. # All rights reserved.
# Slpkg is a user-friendly package manager for Slackware installations # Slpkg is a user-friendly package manager for Slackware installations

View file

@ -2,7 +2,7 @@
# Slackware build script for slpkg # Slackware build script for slpkg
# Copyright 2014-2019 Dimitris Zlatanidis Orestiada, Greece # Copyright 2014-2020 Dimitris Zlatanidis Orestiada, Greece
# All rights reserved. # All rights reserved.
# #
# Redistribution and use of this script, with or without modification, is # Redistribution and use of this script, with or without modification, is

View file

@ -3,7 +3,7 @@
# __metadata__.py file is part of slpkg. # __metadata__.py file is part of slpkg.
# Copyright 2014-2019 Dimitris Zlatanidis <d.zlatanidis@gmail.com> # Copyright 2014-2020 Dimitris Zlatanidis <d.zlatanidis@gmail.com>
# All rights reserved. # All rights reserved.
# Slpkg is a user-friendly package manager for Slackware installations # Slpkg is a user-friendly package manager for Slackware installations
@ -29,11 +29,9 @@ def remove_repositories(repositories, default_repositories):
""" """
Remove no default repositories Remove no default repositories
""" """
repos = []
for repo in repositories: for repo in repositories:
if repo in default_repositories: if repo in default_repositories:
repos.append(repo) yield repo
return repos
def update_repositories(repositories, conf_path): def update_repositories(repositories, conf_path):
@ -78,7 +76,7 @@ class MetaData:
__all__ = "slpkg" __all__ = "slpkg"
__author__ = "dslackw" __author__ = "dslackw"
__version_info__ = (3, 7, 5) __version_info__ = (3, 8, 0)
__version__ = "{0}.{1}.{2}".format(*__version_info__) __version__ = "{0}.{1}.{2}".format(*__version_info__)
__license__ = "GNU General Public License v3 (GPLv3)" __license__ = "GNU General Public License v3 (GPLv3)"
__email__ = "d.zlatanidis@gmail.com" __email__ = "d.zlatanidis@gmail.com"
@ -194,7 +192,7 @@ class MetaData:
mles_sub_repo = grab_sub_repo(repositories, "mles") mles_sub_repo = grab_sub_repo(repositories, "mles")
# remove no default repositories # remove no default repositories
repositories = remove_repositories(repositories, default_repositories) repositories = list(remove_repositories(repositories, default_repositories))
# add custom repositories # add custom repositories
update_repositories(repositories, conf_path) update_repositories(repositories, conf_path)

View file

@ -3,7 +3,7 @@
# arguments.py file is part of slpkg. # arguments.py file is part of slpkg.
# Copyright 2014-2019 Dimitris Zlatanidis <d.zlatanidis@gmail.com> # Copyright 2014-2020 Dimitris Zlatanidis <d.zlatanidis@gmail.com>
# All rights reserved. # All rights reserved.
# Slpkg is a user-friendly package manager for Slackware installations # Slpkg is a user-friendly package manager for Slackware installations

View file

@ -3,7 +3,7 @@
# auto_pkg.py file is part of slpkg. # auto_pkg.py file is part of slpkg.
# Copyright 2014-2019 Dimitris Zlatanidis <d.zlatanidis@gmail.com> # Copyright 2014-2020 Dimitris Zlatanidis <d.zlatanidis@gmail.com>
# All rights reserved. # All rights reserved.
# Slpkg is a user-friendly package manager for Slackware installations # Slpkg is a user-friendly package manager for Slackware installations

View file

@ -3,7 +3,7 @@
# check.py file is part of slpkg. # check.py file is part of slpkg.
# Copyright 2014-2019 Dimitris Zlatanidis <d.zlatanidis@gmail.com> # Copyright 2014-2020 Dimitris Zlatanidis <d.zlatanidis@gmail.com>
# All rights reserved. # All rights reserved.
# Slpkg is a user-friendly package manager for Slackware installations # Slpkg is a user-friendly package manager for Slackware installations

View file

@ -3,7 +3,7 @@
# dependency.py file is part of slpkg. # dependency.py file is part of slpkg.
# Copyright 2014-2019 Dimitris Zlatanidis <d.zlatanidis@gmail.com> # Copyright 2014-2020 Dimitris Zlatanidis <d.zlatanidis@gmail.com>
# All rights reserved. # All rights reserved.
# Slpkg is a user-friendly package manager for Slackware installations # Slpkg is a user-friendly package manager for Slackware installations

View file

@ -3,7 +3,7 @@
# greps.py file is part of slpkg. # greps.py file is part of slpkg.
# Copyright 2014-2019 Dimitris Zlatanidis <d.zlatanidis@gmail.com> # Copyright 2014-2020 Dimitris Zlatanidis <d.zlatanidis@gmail.com>
# All rights reserved. # All rights reserved.
# Slpkg is a user-friendly package manager for Slackware installations # Slpkg is a user-friendly package manager for Slackware installations

View file

@ -3,7 +3,7 @@
# install.py file is part of slpkg. # install.py file is part of slpkg.
# Copyright 2014-2019 Dimitris Zlatanidis <d.zlatanidis@gmail.com> # Copyright 2014-2020 Dimitris Zlatanidis <d.zlatanidis@gmail.com>
# All rights reserved. # All rights reserved.
# Slpkg is a user-friendly package manager for Slackware installations # Slpkg is a user-friendly package manager for Slackware installations

View file

@ -3,7 +3,7 @@
# repo_init.py file is part of slpkg. # repo_init.py file is part of slpkg.
# Copyright 2014-2019 Dimitris Zlatanidis <d.zlatanidis@gmail.com> # Copyright 2014-2020 Dimitris Zlatanidis <d.zlatanidis@gmail.com>
# All rights reserved. # All rights reserved.
# Slpkg is a user-friendly package manager for Slackware installations # Slpkg is a user-friendly package manager for Slackware installations

View file

@ -3,7 +3,7 @@
# search.py file is part of slpkg. # search.py file is part of slpkg.
# Copyright 2014-2019 Dimitris Zlatanidis <d.zlatanidis@gmail.com> # Copyright 2014-2020 Dimitris Zlatanidis <d.zlatanidis@gmail.com>
# All rights reserved. # All rights reserved.
# Slpkg is a user-friendly package manager for Slackware installations # Slpkg is a user-friendly package manager for Slackware installations

View file

@ -3,7 +3,7 @@
# blacklist.py file is part of slpkg. # blacklist.py file is part of slpkg.
# Copyright 2014-2019 Dimitris Zlatanidis <d.zlatanidis@gmail.com> # Copyright 2014-2020 Dimitris Zlatanidis <d.zlatanidis@gmail.com>
# All rights reserved. # All rights reserved.
# Slpkg is a user-friendly package manager for Slackware installations # Slpkg is a user-friendly package manager for Slackware installations

View file

@ -3,7 +3,7 @@
# checks.py file is part of slpkg. # checks.py file is part of slpkg.
# Copyright 2014-2019 Dimitris Zlatanidis <d.zlatanidis@gmail.com> # Copyright 2014-2020 Dimitris Zlatanidis <d.zlatanidis@gmail.com>
# All rights reserved. # All rights reserved.
# Slpkg is a user-friendly package manager for Slackware installations # Slpkg is a user-friendly package manager for Slackware installations
@ -133,4 +133,5 @@ class Updates:
cmd = "Repository is updated." cmd = "Repository is updated."
if self.count_news > 0: if self.count_news > 0:
cmd = "Run the command 'slpkg update'." cmd = "Run the command 'slpkg update'."
print(f"{self.grey}From {self.count_repo} repositories need {self.count_news} updating. {cmd}{self.endc}", end="\n") print(f"{self.grey}From {self.count_repo} repositories need"
f" {self.count_news} updating. {cmd}{self.endc}", end="\n")

View file

@ -3,7 +3,7 @@
# checksum.py file is part of slpkg. # checksum.py file is part of slpkg.
# Copyright 2014-2019 Dimitris Zlatanidis <d.zlatanidis@gmail.com> # Copyright 2014-2020 Dimitris Zlatanidis <d.zlatanidis@gmail.com>
# All rights reserved. # All rights reserved.
# Slpkg is a user-friendly package manager for Slackware installations # Slpkg is a user-friendly package manager for Slackware installations
@ -38,7 +38,8 @@ def check_md5(pkg_md5, src_file):
md5s = md5(src_file) md5s = md5(src_file)
if pkg_md5 != md5s: if pkg_md5 != md5s:
Msg().template(78) Msg().template(78)
print(f"| MD5SUM check for {src_file.split('/')[-1]} [ {red}FAILED{endc} ]") print(f"| MD5SUM check for {src_file.split('/')[-1]}"
f" [ {red}FAILED{endc} ]")
Msg().template(78) Msg().template(78)
print(f"| Expected: {pkg_md5}") print(f"| Expected: {pkg_md5}")
print(f"| Found: {md5s}") print(f"| Found: {md5s}")
@ -48,6 +49,7 @@ def check_md5(pkg_md5, src_file):
raise SystemExit() raise SystemExit()
else: else:
Msg().template(78) Msg().template(78)
print(f"| MD5SUM check for {src_file.split('/')[-1]} [ {green}PASSED{endc} ]") print(f"| MD5SUM check for {src_file.split('/')[-1]}"
f" [ {green}PASSED{endc} ]")
Msg().template(78) Msg().template(78)
print() # new line after pass checksum print() # new line after pass checksum

View file

@ -3,7 +3,7 @@
# clean.py file is part of slpkg. # clean.py file is part of slpkg.
# Copyright 2014-2019 Dimitris Zlatanidis <d.zlatanidis@gmail.com> # Copyright 2014-2020 Dimitris Zlatanidis <d.zlatanidis@gmail.com>
# All rights reserved. # All rights reserved.
# Slpkg is a user-friendly package manager for Slackware installations # Slpkg is a user-friendly package manager for Slackware installations

View file

@ -3,7 +3,7 @@
# config.py file is part of slpkg. # config.py file is part of slpkg.
# Copyright 2014-2019 Dimitris Zlatanidis <d.zlatanidis@gmail.com> # Copyright 2014-2020 Dimitris Zlatanidis <d.zlatanidis@gmail.com>
# All rights reserved. # All rights reserved.
# Slpkg is a user-friendly package manager for Slackware installations # Slpkg is a user-friendly package manager for Slackware installations
@ -86,8 +86,8 @@ class Config:
def reset(self): def reset(self):
"""Reset slpkg.conf file with default values """Reset slpkg.conf file with default values
""" """
shutil.copy2(self.config_file + ".orig", self.config_file) shutil.copy2(f"{self.config_file}.orig", self.config_file)
if filecmp.cmp(self.config_file + ".orig", self.config_file): if filecmp.cmp(f"{self.config_file}.orig", self.config_file):
print(f"{self.green}The reset was done{self.endc}") print(f"{self.green}The reset was done{self.endc}")
else: else:
print(f"{self.red}Reset failed{self.endc}") print(f"{self.red}Reset failed{self.endc}")

View file

@ -3,7 +3,7 @@
# desc.py file is part of slpkg. # desc.py file is part of slpkg.
# Copyright 2014-2019 Dimitris Zlatanidis <d.zlatanidis@gmail.com> # Copyright 2014-2020 Dimitris Zlatanidis <d.zlatanidis@gmail.com>
# All rights reserved. # All rights reserved.
# Slpkg is a user-friendly package manager for Slackware installations # Slpkg is a user-friendly package manager for Slackware installations

View file

@ -3,7 +3,7 @@
# dialog_box.py file is part of slpkg. # dialog_box.py file is part of slpkg.
# Copyright 2014-2019 Dimitris Zlatanidis <d.zlatanidis@gmail.com> # Copyright 2014-2020 Dimitris Zlatanidis <d.zlatanidis@gmail.com>
# All rights reserved. # All rights reserved.
# Slpkg is a user-friendly package manager for Slackware installations # Slpkg is a user-friendly package manager for Slackware installations

View file

@ -3,7 +3,7 @@
# downloader.py file is part of slpkg. # downloader.py file is part of slpkg.
# Copyright 2014-2019 Dimitris Zlatanidis <d.zlatanidis@gmail.com> # Copyright 2014-2020 Dimitris Zlatanidis <d.zlatanidis@gmail.com>
# All rights reserved. # All rights reserved.
# Slpkg is a user-friendly package manager for Slackware installations # Slpkg is a user-friendly package manager for Slackware installations
@ -64,13 +64,20 @@ class Download:
self._make_tarfile(self.file_name, source_dir) self._make_tarfile(self.file_name, source_dir)
self._check_certificate() self._check_certificate()
print(f"\n[{dwn_count}/{len(self.url)}][ {self.green}Download{self.endc} ] --> {self.file_name}\n") print(f"\n[{dwn_count}/{len(self.url)}][ {self.green}"
f"Download{self.endc} ] --> {self.file_name}\n")
if self.downder in ["wget"]: if self.downder in ["wget"]:
subprocess.call(f"{self.downder} {self.downder_options} {self.dir_prefix}{self.path} {dwn}", shell=True) subprocess.call(f"{self.downder} {self.downder_options}"
f" {self.dir_prefix}{self.path} {dwn}",
shell=True)
if self.downder in ["aria2c"]: if self.downder in ["aria2c"]:
subprocess.call(f"{self.downder} {self.downder_options} {self.dir_prefix}{self.path[:-1]} {dwn}", shell=True) subprocess.call(f"{self.downder} {self.downder_options}"
f" {self.dir_prefix}{self.path[:-1]} {dwn}",
shell=True)
elif self.downder in ["curl", "http"]: elif self.downder in ["curl", "http"]:
subprocess.call(f"{self.downder} {self.downder_options} {self.path}{self.file_name} {dwn}", shell=True) subprocess.call(f"{self.downder} {self.downder_options}"
f" {self.path}{self.file_name} {dwn}",
shell=True)
self._check_if_downloaded() self._check_if_downloaded()
dwn_count += 1 dwn_count += 1
@ -94,7 +101,8 @@ class Download:
if not os.path.isfile(self.path + self.file_name): if not os.path.isfile(self.path + self.file_name):
print() print()
self.msg.template(78) self.msg.template(78)
print(f"| Download '{self.file_name}' file [ {self.red}FAILED{self.endc} ]") print(f"| Download '{self.file_name}' file"
f" [ {self.red}FAILED{self.endc} ]")
self.msg.template(78) self.msg.template(78)
print() print()
if not self.msg.answer() in ["y", "Y"]: if not self.msg.answer() in ["y", "Y"]:
@ -108,7 +116,8 @@ class Download:
certificate = (' --no-check-certificate --header="Cookie: ' certificate = (' --no-check-certificate --header="Cookie: '
'oraclelicense=accept-securebackup-cookie"') 'oraclelicense=accept-securebackup-cookie"')
self.msg.template(78) self.msg.template(78)
print(f"| '{certificate[:23].strip()}' need to go ahead downloading") print(f"| '{certificate[:23].strip()}' need to go"
f" ahead downloading")
self.msg.template(78) self.msg.template(78)
print() print()
self.downder_options += certificate self.downder_options += certificate

View file

@ -3,7 +3,7 @@
# file_size.py file is part of slpkg. # file_size.py file is part of slpkg.
# Copyright 2014-2019 Dimitris Zlatanidis <d.zlatanidis@gmail.com> # Copyright 2014-2020 Dimitris Zlatanidis <d.zlatanidis@gmail.com>
# All rights reserved. # All rights reserved.
# Slpkg is a user-friendly package manager for Slackware installations # Slpkg is a user-friendly package manager for Slackware installations

View file

@ -3,7 +3,7 @@
# graph.py file is part of slpkg. # graph.py file is part of slpkg.
# Copyright 2014-2019 Dimitris Zlatanidis <d.zlatanidis@gmail.com> # Copyright 2014-2020 Dimitris Zlatanidis <d.zlatanidis@gmail.com>
# All rights reserved. # All rights reserved.
# Slpkg is a user-friendly package manager for Slackware installations # Slpkg is a user-friendly package manager for Slackware installations

View file

@ -3,7 +3,7 @@
# grep_md5.py file is part of slpkg. # grep_md5.py file is part of slpkg.
# Copyright 2014-2019 Dimitris Zlatanidis <d.zlatanidis@gmail.com> # Copyright 2014-2020 Dimitris Zlatanidis <d.zlatanidis@gmail.com>
# All rights reserved. # All rights reserved.
# Slpkg is a user-friendly package manager for Slackware installations # Slpkg is a user-friendly package manager for Slackware installations

View file

@ -3,7 +3,7 @@
# health.py file is part of slpkg. # health.py file is part of slpkg.
# Copyright 2014-2019 Dimitris Zlatanidis <d.zlatanidis@gmail.com> # Copyright 2014-2020 Dimitris Zlatanidis <d.zlatanidis@gmail.com>
# All rights reserved. # All rights reserved.
# Slpkg is a user-friendly package manager for Slackware installations # Slpkg is a user-friendly package manager for Slackware installations

View file

@ -3,7 +3,7 @@
# init.py file is part of slpkg. # init.py file is part of slpkg.
# Copyright 2014-2019 Dimitris Zlatanidis <d.zlatanidis@gmail.com> # Copyright 2014-2020 Dimitris Zlatanidis <d.zlatanidis@gmail.com>
# All rights reserved. # All rights reserved.
# Slpkg is a user-friendly package manager for Slackware installations # Slpkg is a user-friendly package manager for Slackware installations
@ -51,6 +51,11 @@ class Initialization:
self._SOURCES = self.meta.SBo_SOURCES self._SOURCES = self.meta.SBo_SOURCES
self.slpkg_tmp_packages = self.meta.slpkg_tmp_packages self.slpkg_tmp_packages = self.meta.slpkg_tmp_packages
self.slpkg_tmp_patches = self.meta.slpkg_tmp_patches self.slpkg_tmp_patches = self.meta.slpkg_tmp_patches
self.constructing()
def constructing(self):
"""Creating the all necessary directories
"""
if not os.path.exists(self.conf_path): if not os.path.exists(self.conf_path):
os.mkdir(self.conf_path) os.mkdir(self.conf_path)
if not os.path.exists(self.log_path): if not os.path.exists(self.log_path):

View file

@ -3,7 +3,7 @@
# load.py file is part of slpkg. # load.py file is part of slpkg.
# Copyright 2014-2019 Dimitris Zlatanidis <d.zlatanidis@gmail.com> # Copyright 2014-2020 Dimitris Zlatanidis <d.zlatanidis@gmail.com>
# All rights reserved. # All rights reserved.
# Slpkg is a user-friendly package manager for Slackware installations # Slpkg is a user-friendly package manager for Slackware installations
@ -37,12 +37,12 @@ def library(repo):
pkg_list, packages = [], "" pkg_list, packages = [], ""
if repo == "sbo": if repo == "sbo":
if (os.path.isfile( if (os.path.isfile(
_meta_.lib_path + f"{repo}_repo/SLACKBUILDS.TXT")): f"{_meta_.lib_path}{repo}_repo/SLACKBUILDS.TXT")):
packages = Utils().read_file(_meta_.lib_path + f"{repo}_repo/SLACKBUILDS.TXT") packages = Utils().read_file(f"{_meta_.lib_path}{repo}_repo/SLACKBUILDS.TXT")
else: else:
if (os.path.isfile( if (os.path.isfile(
_meta_.lib_path + f"{repo}_repo/PACKAGES.TXT")): f"{_meta_.lib_path}{repo}_repo/PACKAGES.TXT")):
packages = Utils().read_file(_meta_.lib_path + f"{repo}_repo/PACKAGES.TXT") packages = Utils().read_file(f"{_meta_.lib_path}{repo}_repo/PACKAGES.TXT")
for line in packages.splitlines(): for line in packages.splitlines():
if repo == "sbo": if repo == "sbo":
if line.startswith("SLACKBUILD NAME: "): if line.startswith("SLACKBUILD NAME: "):

View file

@ -3,7 +3,7 @@
# log_deps.py file is part of slpkg. # log_deps.py file is part of slpkg.
# Copyright 2014-2019 Dimitris Zlatanidis <d.zlatanidis@gmail.com> # Copyright 2014-2020 Dimitris Zlatanidis <d.zlatanidis@gmail.com>
# All rights reserved. # All rights reserved.
# Slpkg is a user-friendly package manager for Slackware installations # Slpkg is a user-friendly package manager for Slackware installations

View file

@ -3,7 +3,7 @@
# main.py file is part of slpkg. # main.py file is part of slpkg.
# Copyright 2014-2019 Dimitris Zlatanidis <d.zlatanidis@gmail.com> # Copyright 2014-2020 Dimitris Zlatanidis <d.zlatanidis@gmail.com>
# All rights reserved. # All rights reserved.
# Slpkg is a user-friendly package manager for Slackware installations # Slpkg is a user-friendly package manager for Slackware installations

View file

@ -3,7 +3,7 @@
# md5sum.py file is part of slpkg. # md5sum.py file is part of slpkg.
# Copyright 2014-2019 Dimitris Zlatanidis <d.zlatanidis@gmail.com> # Copyright 2014-2020 Dimitris Zlatanidis <d.zlatanidis@gmail.com>
# All rights reserved. # All rights reserved.
# Slpkg is a user-friendly package manager for Slackware installations # Slpkg is a user-friendly package manager for Slackware installations

View file

@ -3,7 +3,7 @@
# messages.py file is part of slpkg. # messages.py file is part of slpkg.
# Copyright 2014-2019 Dimitris Zlatanidis <d.zlatanidis@gmail.com> # Copyright 2014-2020 Dimitris Zlatanidis <d.zlatanidis@gmail.com>
# All rights reserved. # All rights reserved.
# Slpkg is a user-friendly package manager for Slackware installations # Slpkg is a user-friendly package manager for Slackware installations

View file

@ -3,7 +3,7 @@
# new_config.py file is part of slpkg. # new_config.py file is part of slpkg.
# Copyright 2014-2019 Dimitris Zlatanidis <d.zlatanidis@gmail.com> # Copyright 2014-2020 Dimitris Zlatanidis <d.zlatanidis@gmail.com>
# All rights reserved. # All rights reserved.
# Slpkg is a user-friendly package manager for Slackware installations # Slpkg is a user-friendly package manager for Slackware installations

View file

@ -3,7 +3,7 @@
# build.py file is part of slpkg. # build.py file is part of slpkg.
# Copyright 2014-2019 Dimitris Zlatanidis <d.zlatanidis@gmail.com> # Copyright 2014-2020 Dimitris Zlatanidis <d.zlatanidis@gmail.com>
# All rights reserved. # All rights reserved.
# Slpkg is a user-friendly package manager for Slackware installations # Slpkg is a user-friendly package manager for Slackware installations

View file

@ -3,7 +3,7 @@
# find.py file is part of slpkg. # find.py file is part of slpkg.
# Copyright 2014-2019 Dimitris Zlatanidis <d.zlatanidis@gmail.com> # Copyright 2014-2020 Dimitris Zlatanidis <d.zlatanidis@gmail.com>
# All rights reserved. # All rights reserved.
# Slpkg is a user-friendly package manager for Slackware installations # Slpkg is a user-friendly package manager for Slackware installations

View file

@ -3,7 +3,7 @@
# installed.py file is part of slpkg. # installed.py file is part of slpkg.
# Copyright 2014-2019 Dimitris Zlatanidis <d.zlatanidis@gmail.com> # Copyright 2014-2020 Dimitris Zlatanidis <d.zlatanidis@gmail.com>
# All rights reserved. # All rights reserved.
# Slpkg is a user-friendly package manager for Slackware installations # Slpkg is a user-friendly package manager for Slackware installations

View file

@ -3,7 +3,7 @@
# manager.py file is part of slpkg. # manager.py file is part of slpkg.
# Copyright 2014-2019 Dimitris Zlatanidis <d.zlatanidis@gmail.com> # Copyright 2014-2020 Dimitris Zlatanidis <d.zlatanidis@gmail.com>
# All rights reserved. # All rights reserved.
# Slpkg is a user-friendly package manager for Slackware installations # Slpkg is a user-friendly package manager for Slackware installations

View file

@ -3,7 +3,7 @@
# pkg_find.py file is part of slpkg. # pkg_find.py file is part of slpkg.
# Copyright 2014-2019 Dimitris Zlatanidis <d.zlatanidis@gmail.com> # Copyright 2014-2020 Dimitris Zlatanidis <d.zlatanidis@gmail.com>
# All rights reserved. # All rights reserved.
# Slpkg is a user-friendly package manager for Slackware installations # Slpkg is a user-friendly package manager for Slackware installations
@ -80,5 +80,5 @@ class FindFromRepos:
""" """
ver = "" ver = ""
if repo == "sbo": if repo == "sbo":
ver = "-" + SBoGrep(find).version() ver = f"-{SBoGrep(find).version()}"
return ver return ver

View file

@ -3,7 +3,7 @@
# remove.py file is part of slpkg. # remove.py file is part of slpkg.
# Copyright 2014-2019 Dimitris Zlatanidis <d.zlatanidis@gmail.com> # Copyright 2014-2020 Dimitris Zlatanidis <d.zlatanidis@gmail.com>
# All rights reserved. # All rights reserved.
# Slpkg is a user-friendly package manager for Slackware installations # Slpkg is a user-friendly package manager for Slackware installations

View file

@ -3,7 +3,7 @@
# repoenable.py file is part of slpkg. # repoenable.py file is part of slpkg.
# Copyright 2014-2019 Dimitris Zlatanidis <d.zlatanidis@gmail.com> # Copyright 2014-2020 Dimitris Zlatanidis <d.zlatanidis@gmail.com>
# All rights reserved. # All rights reserved.
# Slpkg is a user-friendly package manager for Slackware installations # Slpkg is a user-friendly package manager for Slackware installations

View file

@ -3,7 +3,7 @@
# repoinfo.py file is part of slpkg. # repoinfo.py file is part of slpkg.
# Copyright 2014-2019 Dimitris Zlatanidis <d.zlatanidis@gmail.com> # Copyright 2014-2020 Dimitris Zlatanidis <d.zlatanidis@gmail.com>
# All rights reserved. # All rights reserved.
# Slpkg is a user-friendly package manager for Slackware installations # Slpkg is a user-friendly package manager for Slackware installations

View file

@ -3,7 +3,7 @@
# repolist.py file is part of slpkg. # repolist.py file is part of slpkg.
# Copyright 2014-2019 Dimitris Zlatanidis <d.zlatanidis@gmail.com> # Copyright 2014-2020 Dimitris Zlatanidis <d.zlatanidis@gmail.com>
# All rights reserved. # All rights reserved.
# Slpkg is a user-friendly package manager for Slackware installations # Slpkg is a user-friendly package manager for Slackware installations

View file

@ -3,7 +3,7 @@
# repositories.py file is part of slpkg. # repositories.py file is part of slpkg.
# Copyright 2014-2019 Dimitris Zlatanidis <d.zlatanidis@gmail.com> # Copyright 2014-2020 Dimitris Zlatanidis <d.zlatanidis@gmail.com>
# All rights reserved. # All rights reserved.
# Slpkg is a user-friendly package manager for Slackware installations # Slpkg is a user-friendly package manager for Slackware installations

View file

@ -3,7 +3,7 @@
# autobuild.py file is part of slpkg. # autobuild.py file is part of slpkg.
# Copyright 2014-2019 Dimitris Zlatanidis <d.zlatanidis@gmail.com> # Copyright 2014-2020 Dimitris Zlatanidis <d.zlatanidis@gmail.com>
# All rights reserved. # All rights reserved.
# Slpkg is a user-friendly package manager for Slackware installations # Slpkg is a user-friendly package manager for Slackware installations

View file

@ -3,7 +3,7 @@
# build_num.py file is part of slpkg. # build_num.py file is part of slpkg.
# Copyright 2014-2019 Dimitris Zlatanidis <d.zlatanidis@gmail.com> # Copyright 2014-2020 Dimitris Zlatanidis <d.zlatanidis@gmail.com>
# All rights reserved. # All rights reserved.
# Slpkg is a user-friendly package manager for Slackware installations # Slpkg is a user-friendly package manager for Slackware installations

View file

@ -3,7 +3,7 @@
# check.py file is part of slpkg. # check.py file is part of slpkg.
# Copyright 2014-2019 Dimitris Zlatanidis <d.zlatanidis@gmail.com> # Copyright 2014-2020 Dimitris Zlatanidis <d.zlatanidis@gmail.com>
# All rights reserved. # All rights reserved.
# Slpkg is a user-friendly package manager for Slackware installations # Slpkg is a user-friendly package manager for Slackware installations

View file

@ -3,7 +3,7 @@
# download.py file is part of slpkg. # download.py file is part of slpkg.
# Copyright 2014-2019 Dimitris Zlatanidis <d.zlatanidis@gmail.com> # Copyright 2014-2020 Dimitris Zlatanidis <d.zlatanidis@gmail.com>
# All rights reserved. # All rights reserved.
# Slpkg is a user-friendly package manager for Slackware installations # Slpkg is a user-friendly package manager for Slackware installations

View file

@ -3,7 +3,7 @@
# dependency.py file is part of slpkg. # dependency.py file is part of slpkg.
# Copyright 2014-2019 Dimitris Zlatanidis <d.zlatanidis@gmail.com> # Copyright 2014-2020 Dimitris Zlatanidis <d.zlatanidis@gmail.com>
# All rights reserved. # All rights reserved.
# Slpkg is a user-friendly package manager for Slackware installations # Slpkg is a user-friendly package manager for Slackware installations
@ -68,5 +68,4 @@ class Requires:
""" """
if dependencies: if dependencies:
self.dep_results.append(dependencies) self.dep_results.append(dependencies)
for dep in dependencies: [self.sbo(dep) for dep in dependencies]
self.sbo(dep)

View file

@ -3,7 +3,7 @@
# greps.py file is part of slpkg. # greps.py file is part of slpkg.
# Copyright 2014-2019 Dimitris Zlatanidis <d.zlatanidis@gmail.com> # Copyright 2014-2020 Dimitris Zlatanidis <d.zlatanidis@gmail.com>
# All rights reserved. # All rights reserved.
# Slpkg is a user-friendly package manager for Slackware installations # Slpkg is a user-friendly package manager for Slackware installations

View file

@ -3,7 +3,7 @@
# network.py file is part of slpkg. # network.py file is part of slpkg.
# Copyright 2014-2019 Dimitris Zlatanidis <d.zlatanidis@gmail.com> # Copyright 2014-2020 Dimitris Zlatanidis <d.zlatanidis@gmail.com>
# All rights reserved. # All rights reserved.
# Slpkg is a user-friendly package manager for Slackware installations # Slpkg is a user-friendly package manager for Slackware installations
@ -23,7 +23,6 @@
import os import os
import sys
import pydoc import pydoc
from slpkg.utils import Utils from slpkg.utils import Utils

View file

@ -3,7 +3,7 @@
# queue.py file is part of slpkg. # queue.py file is part of slpkg.
# Copyright 2014-2019 Dimitris Zlatanidis <d.zlatanidis@gmail.com> # Copyright 2014-2020 Dimitris Zlatanidis <d.zlatanidis@gmail.com>
# All rights reserved. # All rights reserved.
# Slpkg is a user-friendly package manager for Slackware installations # Slpkg is a user-friendly package manager for Slackware installations

View file

@ -3,7 +3,7 @@
# read.py file is part of slpkg. # read.py file is part of slpkg.
# Copyright 2014-2019 Dimitris Zlatanidis <d.zlatanidis@gmail.com> # Copyright 2014-2020 Dimitris Zlatanidis <d.zlatanidis@gmail.com>
# All rights reserved. # All rights reserved.
# Slpkg is a user-friendly package manager for Slackware installations # Slpkg is a user-friendly package manager for Slackware installations

View file

@ -3,7 +3,7 @@
# sbo_arch.py file is part of slpkg. # sbo_arch.py file is part of slpkg.
# Copyright 2014-2019 Dimitris Zlatanidis <d.zlatanidis@gmail.com> # Copyright 2014-2020 Dimitris Zlatanidis <d.zlatanidis@gmail.com>
# All rights reserved. # All rights reserved.
# Slpkg is a user-friendly package manager for Slackware installations # Slpkg is a user-friendly package manager for Slackware installations

View file

@ -3,7 +3,7 @@
# search.py file is part of slpkg. # search.py file is part of slpkg.
# Copyright 2014-2019 Dimitris Zlatanidis <d.zlatanidis@gmail.com> # Copyright 2014-2020 Dimitris Zlatanidis <d.zlatanidis@gmail.com>
# All rights reserved. # All rights reserved.
# Slpkg is a user-friendly package manager for Slackware installations # Slpkg is a user-friendly package manager for Slackware installations

View file

@ -3,7 +3,7 @@
# slack_find.py file is part of slpkg. # slack_find.py file is part of slpkg.
# Copyright 2014-2019 Dimitris Zlatanidis <d.zlatanidis@gmail.com> # Copyright 2014-2020 Dimitris Zlatanidis <d.zlatanidis@gmail.com>
# All rights reserved. # All rights reserved.
# Slpkg is a user-friendly package manager for Slackware installations # Slpkg is a user-friendly package manager for Slackware installations

View file

@ -3,7 +3,7 @@
# slackbuild.py file is part of slpkg. # slackbuild.py file is part of slpkg.
# Copyright 2014-2019 Dimitris Zlatanidis <d.zlatanidis@gmail.com> # Copyright 2014-2020 Dimitris Zlatanidis <d.zlatanidis@gmail.com>
# All rights reserved. # All rights reserved.
# Slpkg is a user-friendly package manager for Slackware installations # Slpkg is a user-friendly package manager for Slackware installations
@ -58,6 +58,7 @@ class SBoInstall:
self.flag = flag self.flag = flag
self.meta = _meta_ self.meta = _meta_
self.green = _meta_.color["GREEN"] self.green = _meta_.color["GREEN"]
self.red = _meta_.color["RED"]
self.yellow = _meta_.color["YELLOW"] self.yellow = _meta_.color["YELLOW"]
self.grey = _meta_.color["GREY"] self.grey = _meta_.color["GREY"]
self.endc = _meta_.color["ENDC"] self.endc = _meta_.color["ENDC"]
@ -353,7 +354,6 @@ class SBoInstall:
if "--download-only" in self.flag: if "--download-only" in self.flag:
continue continue
sources = list(self.filenames(src_link)) sources = list(self.filenames(src_link))
print(sources)
BuildPackage(script, sources, self.build_folder, BuildPackage(script, sources, self.build_folder,
auto=False).build() auto=False).build()
binary = slack_package(prgnam) binary = slack_package(prgnam)

View file

@ -3,7 +3,7 @@
# security.py file is part of slpkg. # security.py file is part of slpkg.
# Copyright 2014-2019 Dimitris Zlatanidis <d.zlatanidis@gmail.com> # Copyright 2014-2020 Dimitris Zlatanidis <d.zlatanidis@gmail.com>
# All rights reserved. # All rights reserved.
# Slpkg is a user-friendly package manager for Slackware installations # Slpkg is a user-friendly package manager for Slackware installations

View file

@ -3,7 +3,7 @@
# sizes.py file is part of slpkg. # sizes.py file is part of slpkg.
# Copyright 2014-2019 Dimitris Zlatanidis <d.zlatanidis@gmail.com> # Copyright 2014-2020 Dimitris Zlatanidis <d.zlatanidis@gmail.com>
# All rights reserved. # All rights reserved.
# Slpkg is a user-friendly package manager for Slackware installations # Slpkg is a user-friendly package manager for Slackware installations

View file

@ -3,7 +3,7 @@
# mirrors.py file is part of slpkg. # mirrors.py file is part of slpkg.
# Copyright 2014-2019 Dimitris Zlatanidis <d.zlatanidis@gmail.com> # Copyright 2014-2020 Dimitris Zlatanidis <d.zlatanidis@gmail.com>
# All rights reserved. # All rights reserved.
# Slpkg is a user-friendly package manager for Slackware installations # Slpkg is a user-friendly package manager for Slackware installations

View file

@ -3,7 +3,7 @@
# patches.py file is part of slpkg. # patches.py file is part of slpkg.
# Copyright 2014-2019 Dimitris Zlatanidis <d.zlatanidis@gmail.com> # Copyright 2014-2020 Dimitris Zlatanidis <d.zlatanidis@gmail.com>
# All rights reserved. # All rights reserved.
# Slpkg is a user-friendly package manager for Slackware installations # Slpkg is a user-friendly package manager for Slackware installations

View file

@ -3,7 +3,7 @@
# slack_version.py file is part of slpkg. # slack_version.py file is part of slpkg.
# Copyright 2014-2019 Dimitris Zlatanidis <d.zlatanidis@gmail.com> # Copyright 2014-2020 Dimitris Zlatanidis <d.zlatanidis@gmail.com>
# All rights reserved. # All rights reserved.
# Slpkg is a user-friendly package manager for Slackware installations # Slpkg is a user-friendly package manager for Slackware installations

View file

@ -3,7 +3,7 @@
# slackware_repo.py file is part of slpkg. # slackware_repo.py file is part of slpkg.
# Copyright 2014-2019 Dimitris Zlatanidis <d.zlatanidis@gmail.com> # Copyright 2014-2020 Dimitris Zlatanidis <d.zlatanidis@gmail.com>
# All rights reserved. # All rights reserved.
# Slpkg is a user-friendly package manager for Slackware installations # Slpkg is a user-friendly package manager for Slackware installations

View file

@ -3,7 +3,7 @@
# slpkg_update.py file is part of slpkg. # slpkg_update.py file is part of slpkg.
# Copyright 2014-2019 Dimitris Zlatanidis <d.zlatanidis@gmail.com> # Copyright 2014-2020 Dimitris Zlatanidis <d.zlatanidis@gmail.com>
# All rights reserved. # All rights reserved.
# Slpkg is a user-friendly package manager for Slackware installations # Slpkg is a user-friendly package manager for Slackware installations

View file

@ -3,7 +3,7 @@
# splitting.py file is part of slpkg. # splitting.py file is part of slpkg.
# Copyright 2014-2019 Dimitris Zlatanidis <d.zlatanidis@gmail.com> # Copyright 2014-2020 Dimitris Zlatanidis <d.zlatanidis@gmail.com>
# All rights reserved. # All rights reserved.
# Slpkg is a user-friendly package manager for Slackware installations # Slpkg is a user-friendly package manager for Slackware installations

View file

@ -3,7 +3,7 @@
# status_deps.py file is part of slpkg. # status_deps.py file is part of slpkg.
# Copyright 2014-2019 Dimitris Zlatanidis <d.zlatanidis@gmail.com> # Copyright 2014-2020 Dimitris Zlatanidis <d.zlatanidis@gmail.com>
# All rights reserved. # All rights reserved.
# Slpkg is a user-friendly package manager for Slackware installations # Slpkg is a user-friendly package manager for Slackware installations

View file

@ -3,7 +3,7 @@
# superuser.py file is part of slpkg. # superuser.py file is part of slpkg.
# Copyright 2014-2019 Dimitris Zlatanidis <d.zlatanidis@gmail.com> # Copyright 2014-2020 Dimitris Zlatanidis <d.zlatanidis@gmail.com>
# All rights reserved. # All rights reserved.
# Slpkg is a user-friendly package manager for Slackware installations # Slpkg is a user-friendly package manager for Slackware installations

View file

@ -3,7 +3,7 @@
# toolbar.py file is part of slpkg. # toolbar.py file is part of slpkg.
# Copyright 2014-2019 Dimitris Zlatanidis <d.zlatanidis@gmail.com> # Copyright 2014-2020 Dimitris Zlatanidis <d.zlatanidis@gmail.com>
# All rights reserved. # All rights reserved.
# Slpkg is a user-friendly package manager for Slackware installations # Slpkg is a user-friendly package manager for Slackware installations

View file

@ -3,7 +3,7 @@
# tracking.py file is part of slpkg. # tracking.py file is part of slpkg.
# Copyright 2014-2019 Dimitris Zlatanidis <d.zlatanidis@gmail.com> # Copyright 2014-2020 Dimitris Zlatanidis <d.zlatanidis@gmail.com>
# All rights reserved. # All rights reserved.
# Slpkg is a user-friendly package manager for Slackware installations # Slpkg is a user-friendly package manager for Slackware installations

View file

@ -3,7 +3,7 @@
# upgrade_checklist.py file is part of slpkg. # upgrade_checklist.py file is part of slpkg.
# Copyright 2014-2019 Dimitris Zlatanidis <d.zlatanidis@gmail.com> # Copyright 2014-2020 Dimitris Zlatanidis <d.zlatanidis@gmail.com>
# All rights reserved. # All rights reserved.
# Slpkg is a user-friendly package manager for Slackware installations # Slpkg is a user-friendly package manager for Slackware installations

View file

@ -3,7 +3,7 @@
# url_read.py file is part of slpkg. # url_read.py file is part of slpkg.
# Copyright 2014-2019 Dimitris Zlatanidis <d.zlatanidis@gmail.com> # Copyright 2014-2020 Dimitris Zlatanidis <d.zlatanidis@gmail.com>
# All rights reserved. # All rights reserved.
# Slpkg is a user-friendly package manager for Slackware installations # Slpkg is a user-friendly package manager for Slackware installations

View file

@ -3,7 +3,7 @@
# utils.py file is part of slpkg. # utils.py file is part of slpkg.
# Copyright 2014-2019 Dimitris Zlatanidis <d.zlatanidis@gmail.com> # Copyright 2014-2020 Dimitris Zlatanidis <d.zlatanidis@gmail.com>
# All rights reserved. # All rights reserved.
# Slpkg is a user-friendly package manager for Slackware installations # Slpkg is a user-friendly package manager for Slackware installations

View file

@ -3,7 +3,7 @@
# version.py file is part of slpkg. # version.py file is part of slpkg.
# Copyright 2014-2019 Dimitris Zlatanidis <d.zlatanidis@gmail.com> # Copyright 2014-2020 Dimitris Zlatanidis <d.zlatanidis@gmail.com>
# All rights reserved. # All rights reserved.
# Slpkg is a user-friendly package manager for Slackware installations # Slpkg is a user-friendly package manager for Slackware installations

View file

@ -3,9 +3,9 @@ from slpkg.md5sum import md5
def test_md5_superuser(): def test_md5_superuser():
result = md5('slpkg/superuser.py') result = md5('slpkg/superuser.py')
assert result == "e6cebdf37fbc1b8e9d3c5e3e53b300c1" assert result == "25ec85aa9c2803ece6397e4147449ea6"
def test_md5_security(): def test_md5_security():
result = md5('slpkg/security.py') result = md5('slpkg/security.py')
assert result == "d395d2fcf1c7b1a91ef6ce3dc8eb047b" assert result == "3f10bf99b21f66af879dc0882bcd92b3"