Fixed packaging

This commit is contained in:
Dimitris Zlatanidis 2022-06-17 19:36:07 +03:00
parent edaf3820b5
commit 91eba2ffea
20 changed files with 54 additions and 49 deletions

0
bin/__init__.py Normal file
View file

View file

@ -16,6 +16,7 @@
"pkg_suffix": ".tgz", "pkg_suffix": ".tgz",
"repo_tag": "_SBo", "repo_tag": "_SBo",
"installpkg": "upgradepkg --install-new", "installpkg": "upgradepkg --install-new",
"reinstall": "upgradepkg --reinstall",
"removepkg": "removepkg", "removepkg": "removepkg",
"colors": "on", "colors": "on",
"wget_options": "-c -N" "wget_options": "-c -N"

View file

@ -24,8 +24,8 @@
__version() { __version() {
# Grab version from __metadata_.py file # Grab version from __metadata_.py file
cat slpkg/__metadata__.py | grep "__version_info__ = (" \ cat slpkg/metadata.py | grep "version_info: tuple = (" \
| tr -d [[:space:]] | cut -c19-23 | tr , . | tr -d [[:space:]] | cut -c21-25 | tr , .
} }
PRGNAM=slpkg PRGNAM=slpkg

View file

@ -19,7 +19,6 @@ setup(
keywords=['slackware', 'slpkg', 'update', 'build', 'install', 'remove', keywords=['slackware', 'slpkg', 'update', 'build', 'install', 'remove',
'slackpkg', 'tool'], 'slackpkg', 'tool'],
author=Metadata.author, author=Metadata.author,
author_email=Metadata.email,
url='https://dslackw.gitlab.io/slpkg/', url='https://dslackw.gitlab.io/slpkg/',
package_data={'': ['LICENSE', 'README.rst', 'ChangeLog.txt']}, package_data={'': ['LICENSE', 'README.rst', 'ChangeLog.txt']},
data_files=[('/etc/slpkg', ['config/slpkg.json']), data_files=[('/etc/slpkg', ['config/slpkg.json']),

View file

@ -1,4 +1,4 @@
Slpkg is a powerful software package manager that installs, updates Slpkg is a software package manager that installs, updates
and removes packages on Slackware based systems. It automatically and removes packages on Slackware based systems. It automatically
computes dependencies and figures out what things should occur computes dependencies and figures out what things should occur
to install packages. Slpkg makes it easier to maintain groups to install packages. Slpkg makes it easier to maintain groups

View file

@ -8,7 +8,7 @@
|-----handy-ruler------------------------------------------------------| |-----handy-ruler------------------------------------------------------|
slpkg: slpkg (Slackware Packaging Tool) slpkg: slpkg (Slackware Packaging Tool)
slpkg: slpkg:
slpkg: Slpkg is a powerful software package manager that installs, updates, slpkg: Slpkg is a software package manager that installs, updates,
slpkg: and removes packages on Slackware based systems. It automatically slpkg: and removes packages on Slackware based systems. It automatically
slpkg: computes dependencies and figures out what things should occur slpkg: computes dependencies and figures out what things should occur
slpkg: to install packages. Slpkg makes it easier to maintain groups of slpkg: to install packages. Slpkg makes it easier to maintain groups of

View file

@ -24,8 +24,8 @@
__version() { __version() {
# Grab version from __metadata_.py file # Grab version from __metadata_.py file
cat ../slpkg/__metadata__.py | grep "__version_info__ = (" \ cat ../slpkg/metadata.py | grep "version_info: tuple = (" \
| tr -d [[:space:]] | cut -c19-23 | tr , . | tr -d [[:space:]] | cut -c21-25 | tr , .
} }
cd $(dirname $0) ; CWD=$(pwd) cd $(dirname $0) ; CWD=$(pwd)
@ -98,10 +98,16 @@ find $PKG -print0 | xargs -0 file | grep -e "executable" -e "shared object" | gr
# install configuration files # install configuration files
mkdir -p $PKG/etc/slpkg mkdir -p $PKG/etc/slpkg
install -D -m0644 conf/slpkg.json $PKG/etc/slpkg/slpkg.json.new install -D -m0644 config/slpkg.json $PKG/etc/slpkg/slpkg.json.new
mkdir -p $PKG/usr/man/man1
cp man/slpkg.1 $PKG/usr/man/man1
find $PKG/usr/man -type f -exec gzip -9 {} \;
for i in $( find $PKG/usr/man -type l ) ; do ln -s $( readlink $i ).gz $i.gz; rm $i ; done
mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
cp -a README.rst ChangeLog.txt LICENSE requirements.txt $PKG/usr/doc/$PRGNAM-$VERSION cp -a README.rst ChangeLog.txt LICENSE.txt requirements.txt $PKG/usr/doc/$PRGNAM-$VERSION
cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
mkdir -p $PKG/install mkdir -p $PKG/install

View file

@ -1 +0,0 @@
from main import Flags

View file

@ -4,9 +4,9 @@
from dataclasses import dataclass from dataclasses import dataclass
from views.views import ViewMessage from slpkg.views.views import ViewMessage
from models.models import LogsDependencies from slpkg.models.models import LogsDependencies
from models.models import session as Session from slpkg.models.models import session as Session
@dataclass @dataclass

View file

@ -1,7 +1,7 @@
#!/usr/bin/python3 #!/usr/bin/python3
# -*- coding: utf-8 -*- # -*- coding: utf-8 -*-
from metadata import Metadata from slpkg.metadata import Metadata
def usage(status): def usage(status):

View file

@ -4,9 +4,9 @@
from dataclasses import dataclass from dataclasses import dataclass
from metadata import Metadata from slpkg.metadata import Metadata
from models.models import SBoTable from slpkg.models.models import SBoTable
from models.models import session as Session from slpkg.models.models import session as Session
@dataclass @dataclass

View file

@ -2,7 +2,7 @@
# -*- coding: utf-8 -*- # -*- coding: utf-8 -*-
from queries import SBoQueries from slpkg.queries import SBoQueries
from dataclasses import dataclass from dataclasses import dataclass

View file

@ -4,7 +4,7 @@
import subprocess import subprocess
from dataclasses import dataclass from dataclasses import dataclass
from metadata import Metadata from slpkg.metadata import Metadata
@dataclass @dataclass

View file

@ -6,13 +6,13 @@ import os
import sys import sys
from dataclasses import dataclass from dataclasses import dataclass
from cli_menu import usage from slpkg.cli_menu import usage
from metadata import Metadata from slpkg.metadata import Metadata
from queries import SBoQueries from slpkg.queries import SBoQueries
from slackbuild import Slackbuilds from slpkg.slackbuild import Slackbuilds
from remove_packages import RemovePackages from slpkg.remove_packages import RemovePackages
from update_repository import UpdateRepository from slpkg.update_repository import UpdateRepository
from clean_logs import CleanLogsDependencies from slpkg.clean_logs import CleanLogsDependencies
@dataclass @dataclass

View file

@ -1,7 +1,7 @@
#!/usr/bin/python3 #!/usr/bin/python3
# -*- coding: utf-8 -*- # -*- coding: utf-8 -*-
from metadata import Metadata from slpkg.metadata import Metadata
from dataclasses import dataclass from dataclasses import dataclass
from sqlalchemy.orm import sessionmaker from sqlalchemy.orm import sessionmaker
from sqlalchemy.ext.declarative import declarative_base from sqlalchemy.ext.declarative import declarative_base

View file

@ -2,9 +2,9 @@
# -*- coding: utf-8 -*- # -*- coding: utf-8 -*-
from metadata import Metadata from slpkg.metadata import Metadata
from models.models import SBoTable from slpkg.models.models import SBoTable
from models.models import session as Session from slpkg.models.models import session as Session
from dataclasses import dataclass from dataclasses import dataclass

View file

@ -4,12 +4,12 @@
import os import os
import subprocess import subprocess
from metadata import Metadata from slpkg.metadata import Metadata
from dataclasses import dataclass from dataclasses import dataclass
from views.views import ViewMessage from slpkg.views.views import ViewMessage
from models.models import LogsDependencies from slpkg.models.models import LogsDependencies
from models.models import session as Session from slpkg.models.models import session as Session
@dataclass @dataclass

View file

@ -7,14 +7,14 @@ import hashlib
import subprocess import subprocess
from dataclasses import dataclass from dataclasses import dataclass
from downloader import Wget from slpkg.downloader import Wget
from metadata import Metadata from slpkg.metadata import Metadata
from queries import SBoQueries from slpkg.queries import SBoQueries
from utilities import Utilities from slpkg.utilities import Utilities
from dependencies import Requires from slpkg.dependencies import Requires
from views.views import ViewMessage from slpkg.views.views import ViewMessage
from models.models import LogsDependencies from slpkg.models.models import LogsDependencies
from models.models import session as Session from slpkg.models.models import session as Session
@dataclass @dataclass

View file

@ -4,11 +4,11 @@
import os import os
from os import path from os import path
from create_data import CreateData from slpkg.create_data import CreateData
from downloader import Wget from slpkg.downloader import Wget
from metadata import Metadata from slpkg.metadata import Metadata
from models.models import SBoTable from slpkg.models.models import SBoTable
from models.models import session as Session from slpkg.models.models import session as Session
from dataclasses import dataclass from dataclasses import dataclass

View file

@ -3,8 +3,8 @@
import os import os
from dataclasses import dataclass from dataclasses import dataclass
from queries import SBoQueries from slpkg.queries import SBoQueries
from metadata import Metadata from slpkg.metadata import Metadata
@dataclass @dataclass