From 4cef810c66aeff4cf364b03edb3ef906b13fda4b Mon Sep 17 00:00:00 2001 From: dslackw Date: Mon, 28 Jul 2014 16:32:43 +0300 Subject: [PATCH] updated for version 1.6.5 --- CHANGELOG | 3 ++- PKG-INFO | 2 +- man/slpkg.8 | 42 ++++++++++++++++++++++------------------- slpkg/__metadata__.py | 2 +- slpkg/pkg/build.py | 2 +- slpkg/pkg/manager.py | 6 +++--- slpkg/sbo/check.py | 16 ++++++++-------- slpkg/sbo/dependency.py | 4 ++-- slpkg/sbo/greps.py | 4 ++-- slpkg/sbo/read.py | 4 ++-- slpkg/sbo/search.py | 8 ++++---- slpkg/sbo/slackbuild.py | 16 ++++++++-------- slpkg/sbo/views.py | 17 +++++++++-------- slpkg/slack/install.py | 12 ++++++------ slpkg/slack/mirrors.py | 2 +- slpkg/slack/patches.py | 10 +++++----- 16 files changed, 78 insertions(+), 72 deletions(-) diff --git a/CHANGELOG b/CHANGELOG index 290ec8ed..37c1e199 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -1,9 +1,10 @@ -29-07-2014 +28-07-2014 Version 1.6.5 [Feature] - Added slack, noarch and other in list (slpkg -l) Added index in list (slpkg -l) Added install packages via official Slackware mirrors + Fix messages [Updated] - Arguments views diff --git a/PKG-INFO b/PKG-INFO index 8c3fdf8c..771afaa9 100644 --- a/PKG-INFO +++ b/PKG-INFO @@ -1,6 +1,6 @@ Metadata-Version: 1.1 Name: slpkg -Version: 1.6.4 +Version: 1.6.5 Author: dslackw Author-email: d zlatanidis at gmail com Maintainer: dslackw diff --git a/man/slpkg.8 b/man/slpkg.8 index 86985215..665c611d 100755 --- a/man/slpkg.8 +++ b/man/slpkg.8 @@ -13,30 +13,32 @@ .\" .TH Slpkg "8" "5 2014" "slpkg" .SH NAME -slpkg - Utility to help package management in Slackware +slpkg - Utility for easy management packages in Slackware .SH SYNOPSIS \fBslpkg\fP \fB-h\fP \fB-v\fP \fB-a script [source ...]\fP \fB-l all, sbo [all, sbo ...]\fP - \fB-t\fP \fB-n\fP \fB-c sbo, slack [sbo, slack ...]\fP \fB-s\fP \fB-i [...]\fP \fB-u [...]\fP - \fB-o [...]\fP \fB-r [...]\fP \fB-f [...]\fP \fB-d [...]\fP + \fB-t\fP \fB-n\fP \fB-c sbo, slack [sbo, slack ...]\fP \fB-s\ slack [sbo, slack ...] fP\fB-i + [...]\fP \fB-u [...]\fP \fB-o [...]\fP \fB-r [...]\fP \fB-f [...]\fP \fB-d [...]\fP .SH DESCRIPTION -\fBslpkg\fP is a terminal tool in order to easy use Slackware packages. +\fBslpkg\fP is a terminal multitool in order to easy use Slackware packages. .PP It's a quick and easy way to manage your packages in slackware to a command. .SH EXAMPLES \fB-h, --help show this help message and exit\fP \fB-v, --verbose print version and exit\fP \fB-a script [source ...]\fP - \fB auto build package\fP - \fB-l all, sbo [all, sbo ...]\fP + \fB auto build package\fP + \fB-l all, sbo [all, sbo, slack, noarch, other [all, sbo, slack, noarch, other ...]\fP + \fB list of installed packages\fP + \fB-c sbo, slack [sbo, slack ...]\fp + \fB check if your packages is up to date\fP + \fB-s sbo, slack [sbo, slack ...]\fP + \fB download, build & install packages\fP \fB list of installed packages\fP \fB-t tracking dependencies\fP - \fB-n find from SBo repositority\fP - \fB-c sbo, slack [sbo, slack ...]\fp - \fb check if your package is up to date\fP - \fB-s download, build & install packages from SBo\fP + \fB-n find packages from SBo repositority\fP \fB-i [ ...] install binary packages\fP - \fB-u [ ...] install-upgrade packages with new\fP - \fB-o [ ...] reinstall the same packages\fP + \fB-u [ ...] upgrade binary packages\fP + \fB-o [ ...] reinstall binary packages\fP \fB-r [ ...] remove packages\fP \fB-f [ ...] find if packages installed\fP \fB-d [ ...] display the contents of the packages\fP @@ -73,11 +75,13 @@ the network. (www.slackbuilds.org) .PP Check your packages from Slackware official mirrors or from slackbuilds.org is up to date. -.SS -s , find, download, build and install package with all dependencies -\fBslpkg\fP \fB-s\fP <\fIname of package\fP> +.SS -s , sbo, slack [sbo, slack ...] find, download, build and install +package with all dependencies +\fBslpkg\fP \fB-s\fP <\fIsbo\fP> <\fIslack\fP> <\fIname of package\fP> .PP Find package from slackbuild.org with all dependencies, -download, build and install them. +download, build and install them. Even download and install official +packages from Slackware official mirrors and install. .SS -i , install binary package \fBslpkg\fP \fB-i\fP <\fIpackages.t?z\fP> .PP @@ -166,7 +170,7 @@ $ \fBslpkg -s brasero\fP $ \fBslpkg -c sbo flashplayer-plugin\fP - Searching `flashplayer-plugin` from slackbuilds.org ... + Searching [ flashplayer-plugin ] from slackbuilds.org ... New version is available: +============================================================================== @@ -181,13 +185,13 @@ $ \fBslpkg -c slack upgrade\fp $ \fBslpkg -n termcolor\fP - Searching 'termcolor' from slackbuilds.org ... + Searching [ termcolor ] from slackbuilds.org ... +============================================================================== | Package termcolor --> http://slackbuilds.org/repository/14.1/python/termcolor/ +============================================================================== - | SlackBuild : http://slackbuilds.org/slackbuilds/14.1/python/termcolor.tar.gz - | Source : https://pypi.python.org/packages/source/t/termcolor/termcolor-1.1.0.tar.gz + | SlackBuild : termcolor.tar.gz + | Source : termcolor-1.1.0.tar.gz | Extra : | Requirements : +=============================================================================== diff --git a/slpkg/__metadata__.py b/slpkg/__metadata__.py index 0346d1b1..e92b715e 100644 --- a/slpkg/__metadata__.py +++ b/slpkg/__metadata__.py @@ -5,7 +5,7 @@ import os __all__ = "slpkg" __author__ = "dslackw" -__version_info__ = (1, 6, 4) +__version_info__ = (1, 6, 5) __version__ = "{0}.{1}.{2}".format(*__version_info__) __license__ = "GNU General Public License v3 (GPLv3)" __email__ = "d.zlatanidis@gmail.com" diff --git a/slpkg/pkg/build.py b/slpkg/pkg/build.py index 6ff67ecb..1c9e97eb 100755 --- a/slpkg/pkg/build.py +++ b/slpkg/pkg/build.py @@ -6,7 +6,7 @@ import shutil import tarfile import subprocess -from messages import pkg_not_found +from slpkg.messages import pkg_not_found def build_extra_pkg(script, source, extra): ''' diff --git a/slpkg/pkg/manager.py b/slpkg/pkg/manager.py index 8f094834..7e7f5bd0 100755 --- a/slpkg/pkg/manager.py +++ b/slpkg/pkg/manager.py @@ -5,9 +5,9 @@ import os import sys import getpass import subprocess -from colors import colors -from __metadata__ import pkg_path, uname, arch, sp -from messages import pkg_not_found, s_user, template +from slpkg.colors import colors +from slpkg.__metadata__ import pkg_path, uname, arch, sp +from slpkg.messages import pkg_not_found, s_user, template from find import find_package diff --git a/slpkg/sbo/check.py b/slpkg/sbo/check.py index 65f60cd9..9318cb36 100755 --- a/slpkg/sbo/check.py +++ b/slpkg/sbo/check.py @@ -3,15 +3,15 @@ import os import getpass -from pkg.build import * -from pkg.find import find_package -from pkg.manager import pkg_upgrade +from slpkg.pkg.build import * +from slpkg.pkg.find import find_package +from slpkg.pkg.manager import pkg_upgrade -from colors import colors -from functions import get_file -from messages import pkg_not_found, s_user, template -from __metadata__ import tmp, pkg_path, uname, arch, sp -from __metadata__ import sbo_arch, sbo_tag, sbo_filetype +from slpkg.colors import colors +from slpkg.functions import get_file +from slpkg.messages import pkg_not_found, s_user, template +from slpkg.__metadata__ import tmp, pkg_path, uname, arch, sp +from slpkg.__metadata__ import sbo_arch, sbo_tag, sbo_filetype from search import sbo_search_pkg from download import sbo_slackbuild_dwn diff --git a/slpkg/sbo/dependency.py b/slpkg/sbo/dependency.py index 695de982..1ee37aa1 100755 --- a/slpkg/sbo/dependency.py +++ b/slpkg/sbo/dependency.py @@ -1,8 +1,8 @@ #!/usr/bin/python # -*- coding: utf-8 -*- -from colors import colors -from messages import pkg_not_found, template +from slpkg.colors import colors +from slpkg.messages import pkg_not_found, template from greps import * from search import sbo_search_pkg diff --git a/slpkg/sbo/greps.py b/slpkg/sbo/greps.py index 83a8abc5..041c2654 100755 --- a/slpkg/sbo/greps.py +++ b/slpkg/sbo/greps.py @@ -2,8 +2,8 @@ # -*- coding: utf-8 -*- import os -from url_read import url_read -from __metadata__ import uname, arch +from slpkg.url_read import url_read +from slpkg.__metadata__ import uname, arch def sbo_source_dwn(sbo_url, name): ''' diff --git a/slpkg/sbo/read.py b/slpkg/sbo/read.py index 4ef53e9a..f31b8500 100755 --- a/slpkg/sbo/read.py +++ b/slpkg/sbo/read.py @@ -3,8 +3,8 @@ import os import getpass -from messages import s_user -from url_read import url_read +from slpkg.messages import s_user +from slpkg.url_read import url_read # create tmp directory if not exist os.system("mkdir -p /tmp/slpkg/readme/") diff --git a/slpkg/sbo/search.py b/slpkg/sbo/search.py index d36227d2..38042d22 100755 --- a/slpkg/sbo/search.py +++ b/slpkg/sbo/search.py @@ -3,11 +3,11 @@ import re import sys -from colors import colors -from url_read import url_read -from functions import get_file +from slpkg.colors import colors +from slpkg.url_read import url_read +from slpkg.functions import get_file -from slack.slack_version import slack_ver +from slpkg.slack.slack_version import slack_ver def sbo_search_pkg(name): ''' diff --git a/slpkg/sbo/slackbuild.py b/slpkg/sbo/slackbuild.py index ff48ce56..f2165c42 100755 --- a/slpkg/sbo/slackbuild.py +++ b/slpkg/sbo/slackbuild.py @@ -4,15 +4,15 @@ import os import sys import getpass -from colors import colors -from functions import get_file -from __metadata__ import tmp, pkg_path, sp -from __metadata__ import sbo_arch, sbo_tag, sbo_filetype -from messages import s_user, pkg_found, pkg_installed, template +from slpkg.colors import colors +from slpkg.functions import get_file +from slpkg.__metadata__ import tmp, pkg_path, sp +from slpkg.__metadata__ import sbo_arch, sbo_tag, sbo_filetype +from slpkg.messages import s_user, pkg_found, pkg_installed, template -from pkg.build import * -from pkg.find import find_package -from pkg.manager import pkg_upgrade +from slpkg.pkg.build import * +from slpkg.pkg.find import find_package +from slpkg.pkg.manager import pkg_upgrade from dependency import sbo_dependencies_links_pkg diff --git a/slpkg/sbo/views.py b/slpkg/sbo/views.py index 120feca6..3e3cd686 100755 --- a/slpkg/sbo/views.py +++ b/slpkg/sbo/views.py @@ -1,15 +1,16 @@ #!/usr/bin/python # -*- coding: utf-8 -*- -from colors import colors -from functions import get_file -from __metadata__ import tmp, pkg_path, slpkg_path, sp -from __metadata__ import sbo_arch, sbo_tag, sbo_filetype -from messages import s_user, pkg_not_found, pkg_found, view_sbo, template +import os +from slpkg.colors import colors +from slpkg.functions import get_file +from slpkg.__metadata__ import tmp, pkg_path, slpkg_path, sp +from slpkg.__metadata__ import sbo_arch, sbo_tag, sbo_filetype +from slpkg.messages import s_user, pkg_not_found, pkg_found, view_sbo, template -from pkg.build import * -from pkg.find import find_package -from pkg.manager import pkg_upgrade +from slpkg.pkg.build import * +from slpkg.pkg.find import find_package +from slpkg.pkg.manager import pkg_upgrade from read import * from greps import * diff --git a/slpkg/slack/install.py b/slpkg/slack/install.py index 13cce52f..2bbc7f68 100755 --- a/slpkg/slack/install.py +++ b/slpkg/slack/install.py @@ -2,13 +2,13 @@ # -*- coding: utf-8 -*- import os -from colors import colors -from url_read import url_read -from messages import pkg_not_found -from __metadata__ import slpkg_path, pkg_path +from slpkg.colors import colors +from slpkg.url_read import url_read +from slpkg.messages import pkg_not_found +from slpkg.__metadata__ import slpkg_path, pkg_path -from pkg.find import find_package -from pkg.manager import pkg_upgrade +from slpkg.pkg.find import find_package +from slpkg.pkg.manager import pkg_upgrade from mirrors import mirrors diff --git a/slpkg/slack/mirrors.py b/slpkg/slack/mirrors.py index 9e0a45b6..8352893d 100755 --- a/slpkg/slack/mirrors.py +++ b/slpkg/slack/mirrors.py @@ -1,7 +1,7 @@ #!/usr/bin/python # -*- coding: utf-8 -*- -from __metadata__ import arch +from slpkg.__metadata__ import arch from slack_version import slack_ver def mirrors(name, location): diff --git a/slpkg/slack/patches.py b/slpkg/slack/patches.py index f6cf2354..6b33ea8e 100755 --- a/slpkg/slack/patches.py +++ b/slpkg/slack/patches.py @@ -2,12 +2,12 @@ # -*- coding: utf-8 -*- import os -from colors import colors -from url_read import url_read -from __metadata__ import pkg_path, slpkg_path +from slpkg.colors import colors +from slpkg.url_read import url_read +from slpkg.__metadata__ import pkg_path, slpkg_path -from pkg.find import find_package -from pkg.manager import pkg_upgrade +from slpkg.pkg.find import find_package +from slpkg.pkg.manager import pkg_upgrade from mirrors import mirrors