From 936ef97088ce50365e0b0bebcf13341fcf384ef0 Mon Sep 17 00:00:00 2001 From: Dimitris Zlatanidis Date: Tue, 2 Dec 2014 01:27:17 +0200 Subject: [PATCH] updated --- CHANGELOG | 29 +++++++++++------- README.rst | 10 +++++-- conf/slpkg.conf | 7 +++++ man/slpkg.8 | 79 +++++++++++++++++++++++++------------------------ 4 files changed, 73 insertions(+), 52 deletions(-) diff --git a/CHANGELOG b/CHANGELOG index d6366016..4916d203 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -1,4 +1,13 @@ -Version 2.1.0-dev +Version 2.1.1-dev +01-12-2014 + +[Feature] - Added options in /etc/slpkg/slpkg.conf file to select + repositories. + - Added options to skip unsupported and untested packages. + +[Updated] - Bugfix TypeError for unsupported/untested sbo packages. + +Version 2.1.0 28-11-2014 [Updated] - Fix change build path. @@ -14,13 +23,13 @@ Version 2.0.9 Version 2.0.8 25-11-2014 -[Updated] - Add more options in slpkg configuration file. +[Updated] - Added more options in slpkg configuration file. Version 2.0.7 22-11-2014 -[Feature] - Add more option in slpkg.conf file. - - Add slackware-mirrors file in /etc/slpkg +[Feature] - Added more option in slpkg.conf file. + - Added slackware-mirrors file in /etc/slpkg [Updated] - Fix upgrade Slackware packages if installed. @@ -32,19 +41,19 @@ Version 2.0.6 Version 2.0.5 18-11-2014 -[Feature] - Add /etc/slpkg.conf file. +[Feature] - Added /etc/slpkg.conf file. - Move "--current" switch in /etc/slpkg.conf file. - - Add local PACKAGES.TXT for Slackware repository. - - Add options to view package description. - - Add all repositories in tracking dependencies options '-t'. - - Add configuration file managment + - Added local PACKAGES.TXT for Slackware repository. + - Added options to view package description. + - Added all repositories in tracking dependencies options '-t'. + - Added configuration file managment [Updated] - Bugfix upgrading binary packages. Version 2.0.4 07-11-2014 -[Feature] - Add Robby Workman, Alien Bob (Eric Hameleers) and +[Feature] - Added Robby Workman, Alien Bob (Eric Hameleers) and slacky.eu repositories. [Updated] - Fix remove list reference. diff --git a/README.rst b/README.rst index c1377e0a..885a4fb8 100644 --- a/README.rst +++ b/README.rst @@ -50,6 +50,9 @@ Supported Repositories: Arch: {x86, x86_64} Versions: {13.37, 14.0, 14.1} +* Choose repositories you need to work from file '/etc/slpkg/slpkg.conf' default is all repositories. + + Slpkg works in accordance with the standards of the organization slackbuilds.org to builds packages. Also uses the Slackware linux instructions for installation, upgrading or removing packages. @@ -136,6 +139,9 @@ Upgrade In each slpkg upgrade should track the configuration files in the file '/etc/slpkg' for new updates. +*** IMPORTANT : +*** Recommended to replace '/etc/slpkg/slpkg.conf' file with '/etc/slpkg/slpkg.conf.new' file. + Configuration files ------------------- @@ -197,8 +203,6 @@ Command Line Tool Usage -r, [package...] remove binary packages -d, [package...] display the contents - Repositories: - Colors = [red, green, yellow, cyan, grey] Slpkg Examples -------------- @@ -700,7 +704,7 @@ Print package description: .. code-block:: bash - $ slpkg -p alien vlc + $ slpkg -p alien vlc --color=green vlc (multimedia player for various audio and video formats) diff --git a/conf/slpkg.conf b/conf/slpkg.conf index c1d2f444..55de32d8 100644 --- a/conf/slpkg.conf +++ b/conf/slpkg.conf @@ -23,6 +23,10 @@ # Slackware version 'stable' or 'current'. VERSION=stable +# Choose repositories want to work. +# Available repositories : slack, sbo, alien, rlw, slacky, studio +REPOSITORIES=slack,sbo,alien,rlw,slacky,studio + # Build directory for repository slackbuilds.org. In this directory # downloaded sources and scripts for building. BUILD=/tmp/slpkg/build/ @@ -55,6 +59,9 @@ DEFAULT_ANSWER=n # Choose 'y' if you do not want to question. REMOVE_DEPS_ANSWER=n +# If you want build UNSUPPORTED or UNTESTED packages choose 'y'. +SKIP_UNST=n + # Delete package dependencies if DEL_DEPS is on. DEL_DEPS=on diff --git a/man/slpkg.8 b/man/slpkg.8 index 2eb4f28c..65eb3b86 100644 --- a/man/slpkg.8 +++ b/man/slpkg.8 @@ -15,51 +15,52 @@ .SH NAME slpkg - Utility for easy management packages in Slackware .SH SYNOPSIS - \fBUsage: slpkg [-h] [-v] [-a script.tar.gz [sources...]] - [-b --list, --add, --remove [...]] - [-q --list, [...] --add, --remove] - [ --build, --install, --build-install] - [-g --config, --config=[editor]] - [-l [repository], all, noarch] - [-c [repository] --upgrade] - [-s [repository] [package][ - [-t [repository] [package]] - [-p [repository] [package] --color=] - [-f] [-n] [-i [...]] [-u [...]] - [-o [...]] [-r [...]] [-d [...]]\fp +Usage: slpkg [-h] [-v] [-a script.tar.gz [sources...]] + [-b --list, --add, --remove [...]] + [-q --list, [...] --add, --remove] + [ --build, --install, --build-install] + [-g --config, --config=[editor]] + [-l [repository], all, noarch] + [-c [repository] --upgrade] + [-s [repository] [package][ + [-t [repository] [package]] + [-p [repository] [package] --color=] + [-f] [-n] [-i [...]] [-u [...]] + [-o [...]] [-r [...]] [-d [...]] .SH DESCRIPTION \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 - Utility for easy management packages in Slackware +Utility for easy management packages in Slackware - Optional arguments: - -h, --help show this help message and exit - -v, --version print version and exit - -a, script.tar.gz [source...] auto build SBo packages - -b, --list, [package...] --add, --remove add, remove packages in blacklist - -q, --list, [package...] --add, --remove add, remove SBo packages in queue - --build, --install, --build-install build, install packages from queue - -g, --config, --config= configuration file management - -l, [repository], all, noarch list of installed packages - -c, [repository] --upgrade check for updated packages - -s, [repository] [package] download, build & install - -t, [repository] [package] tracking dependencies - -p, [repository] [package] --color=[] print package description - -f, [package] find installed packages - -n, [package] view packages from SBo - -i, [package...] install binary packages - -u, [package...] upgrade binary packages - -o, [package...] reinstall binary packages - -r, [package...] remove binary packages - -d, [package...] display the contents - - Repositories: - Colors = [red, green, yellow, cyan, grey]\fP +Optional arguments: + -h, --help show this help message and exit + -v, --version print version and exit + -a, script.tar.gz [source...] auto build SBo packages + -b, --list, [package...] --add, --remove add, remove packages in blacklist + -q, --list, [package...] --add, --remove add, remove SBo packages in queue + --build, --install, --build-install build, install packages from queue + -g, --config, --config= configuration file management + -l, [repository], all, noarch list of installed packages + -c, [repository] --upgrade check for updated packages + -s, [repository] [package] download, build & install + -t, [repository] [package] tracking dependencies + -p, [repository] [package] --color=[] print package description + -f, [package] find installed packages + -n, [package] view packages from SBo + -i, [package...] install binary packages + -u, [package...] upgrade binary packages + -o, [package...] reinstall binary packages + -r, [package...] remove binary packages + -d, [package...] display the contents +.SH REPOSITORIES + slack, sbo, alien, slacky, rlw, studio +.SH COLORS + red, green, yellow, cyan, grey +.PP .SH GLOBAL OPTIONS .TP \fB\-v\fP, \fB\-\-version\fP @@ -117,9 +118,9 @@ Tracking all dependencies of that package. The sequence shown is that you must follow to correctly install package. .SS -p , print packages description -\fBslpkg\fP \fB-p\fP <\fIrepository\fP> <\fIname of package\fP> +\fBslpkg\fP \fB-p\fP <\fIrepository\fP> <\fIname of package\fP> \fI--color=\fP .PP -Print package description +Print package description with color. Available colors: red, green, yellow, cyan, grey .SS -f find packages \fBslpkg\fP \fB-f\fP <\fIname of package\fP>