Merge branch 'develop'

This commit is contained in:
Dimitris Zlatanidis 2022-11-09 18:06:17 +02:00
commit 1ecfb11da3
6 changed files with 18 additions and 12 deletions

View file

@ -1,3 +1,7 @@
4.2.8 - 06/11/2022
Updated:
- Check the SBo script exists before patching the tag
4.2.7 - 05/11/2022 4.2.7 - 05/11/2022
Fixed: Fixed:
- Switch to check ChangeLogs.txt files by size - Switch to check ChangeLogs.txt files by size

View file

@ -30,8 +30,8 @@ Install from the official third-party `SBo repository <https://slackbuilds.org/r
.. code-block:: bash .. code-block:: bash
$ tar xvf slpkg-4.2.7.tar.gz $ tar xvf slpkg-4.2.8.tar.gz
$ cd slpkg-4.2.7 $ cd slpkg-4.2.8
$ ./install.sh $ ./install.sh

View file

@ -29,7 +29,7 @@ configs:
# The sbo tar suffix. # The sbo tar suffix.
sbo_tar_suffix: .tar.gz sbo_tar_suffix: .tar.gz
# The sbo repo tag. # The sbo repository tag.
sbo_repo_tag: _SBo sbo_repo_tag: _SBo
# Slackware install command. Alternative you can # Slackware install command. Alternative you can

View file

@ -1,6 +1,6 @@
[metadata] [metadata]
name = slpkg name = slpkg
version = 4.2.7 version = 4.2.8
license_file = LICENSE license_file = LICENSE
author = Dimitris Zlatanidis author = Dimitris Zlatanidis
author_email = d.zlatanidis@gmail.com author_email = d.zlatanidis@gmail.com

View file

@ -126,14 +126,16 @@ class Slackbuilds:
def patch_sbo_tag(self, sbo): def patch_sbo_tag(self, sbo):
''' Patching SBo TAG from the configuration file. ''' ''' Patching SBo TAG from the configuration file. '''
sbo_script = f'{self.build_path}/{sbo}/{sbo}.SlackBuild' sbo_script = f'{self.build_path}/{sbo}/{sbo}.SlackBuild'
with open(sbo_script, 'r', encoding='utf-8') as f:
lines = f.readlines()
with open(sbo_script, 'w') as script: if os.path.isfile(sbo_script):
for line in lines: with open(sbo_script, 'r', encoding='utf-8') as f:
if line.startswith('TAG=$'): lines = f.readlines()
line = f'TAG=${{TAG:-{self.sbo_repo_tag}}}\n'
script.write(line) with open(sbo_script, 'w') as script:
for line in lines:
if line.startswith('TAG=$'):
line = f'TAG=${{TAG:-{self.sbo_repo_tag}}}\n'
script.write(line)
def logging_installed_dependencies(self, name: str): def logging_installed_dependencies(self, name: str):
''' Logging installed dependencies and used for remove. ''' ''' Logging installed dependencies and used for remove. '''

View file

@ -10,7 +10,7 @@ from slpkg.configs import Configs
@dataclass @dataclass
class Version: class Version:
prog_name: str = Configs.prog_name prog_name: str = Configs.prog_name
version_info: tuple = (4, 2, 7) version_info: tuple = (4, 2, 8)
version: str = '{0}.{1}.{2}'.format(*version_info) version: str = '{0}.{1}.{2}'.format(*version_info)
license: str = 'MIT License' license: str = 'MIT License'
author: str = 'dslackw' author: str = 'dslackw'