diff --git a/CHANGELOG b/CHANGELOG index bf365b26..70800b02 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -1,3 +1,8 @@ +05-06-2014 +Version 1.4.6 + +[Updated] - Fix build noarch packages + 04-06-2014 Version 1.4.5 diff --git a/PKG-INFO b/PKG-INFO index d1687981..c50ecf64 100644 --- a/PKG-INFO +++ b/PKG-INFO @@ -1,11 +1,11 @@ Metadata-Version: 1.1 Name: slpkg -Version: 1.4.5 +Version: 1.4.6 Author: dslackw Author-email: d zlatanidis at gmail com Maintainer: dslackw Maintainer-email: d zlatanidis at gmail com -Home-page: https://github.com/dslackw/slpkg +Home-page: http://dslackw.github.io/slpkg/ Summary: Utility to help package management in Slackware Description: .. image:: https://badge.fury.io/py/slpkg.png :target: http://badge.fury.io/py/slpkg @@ -15,34 +15,42 @@ Description: .. image:: https://badge.fury.io/py/slpkg.png :target: https://pypi.python.org/pypi/slpkg + Slpkg is a terminal tool in order to easy use Slackware packages. + + .. image:: https://raw.githubusercontent.com/dslackw/slpkg/master/logo/slpkg.png :scale: 60% :width: 30% :align: left - Slpkg is a terminal tool in order to easy use Slackware packages. - Features -------- + - Download package with all dependencies, + build and install all in a command - Automatic tool build and install packages - List all installed packages - Ī¤racking dependencies - Checking for updated packages - Find and Download packages from SBo repositority + - View README file + - View SlackBuild file + - View Info file + - Auto Download and Build packages - Install binary packages - Install-upgrade packages with new - Reinstall the same packages - Remove packages - Find installed packages - Display the contents of the packages + - No dependencies It's a quick and easy way to manage your packages in slackware to a command. - [CHANGELOG] : https://github.com/dslackw/slpkg/blob/master/CHANGELOG + Installation ------------ @@ -73,25 +81,26 @@ Description: .. image:: https://badge.fury.io/py/slpkg.png .. code-block:: bash - usage: slpkg [-h] [-v] [-s script [source ...]] [-l all, sbo [all, sbo ...]] - [-t] [-n] [-c] [-i [...]] [-u [...]] [-a [...]] [-r [...]] - [-f [...]] [-d [...]] + usage: slpkg [-h] [-v] [-a script [source ...]] [-l all, sbo [all, sbo ...]] + [-t] [-n] [-c] [-s] [-i [...]] [-u [...]] [-o [...]] + [-r [...]] [-f [...]] [-d [...]] Utility to help package management in Slackware optional arguments: -h, --help show this help message and exit -v, --verbose print version and exit - -s script [source ...] + -a script [source ...] auto build package -l all, sbo [all, sbo ...] list of installed packages -t tracking dependencies -n find from SBo repositority -c check if your package is up to date + -s download, build & install pkg from SBo -i [ ...] install binary packages -u [ ...] install-upgrade packages with new - -a [ ...] reinstall the same packages + -o [ ...] reinstall the same packages -r [ ...] remove packages -f [ ...] find if packages installed -d [ ...] display the contents of the packages @@ -101,8 +110,47 @@ Description: .. image:: https://badge.fury.io/py/slpkg.png Slpkg Examples -------------- + Find package from slackbuilds.org download, + build and install with all dependencies : - Tracking all dependencies of that package: + .. code-block:: bash + + $ slpkg -s brasero + Searching `brasero` from slackbuilds.org ... + Searching `libunique` from slackbuilds.org ..... + Searching `gst1-plugins-bad` from slackbuilds.org ...... + Searching `gst1-plugins-base` from slackbuilds.org ........ + Searching `gstreamer1` from slackbuilds.org .... + Searching `orc` from slackbuilds.org .... + + ++============================================================================== + | Installing new package /tmp/brasero-3.11.3-x86_64-1_SBo.tgz + ++============================================================================== + + Verifying package brasero-3.11.3-x86_64-1_SBo.tgz. + Installing package brasero-3.11.3-x86_64-1_SBo.tgz: + PACKAGE DESCRIPTION: + # brasero (CD/DVD burning application) + # + # Brasero is a application to burn CD/DVD for the Gnome Desktop. It is + # designed to be as simple as possible and has some unique features to + # enable users to create their discs easily and quickly. + # + # Homepage: http://projects.gnome.org/brasero + # + Executing install script for brasero-3.11.3-x86_64-1_SBo.tgz. + Package brasero-3.11.3-x86_64-1_SBo.tgz installed. + + The package `orc` was installed + The package `gstreamer1` was installed + The package `gst1-plugins-base` was installed + The package `gst1-plugins-bad` was installed + The package `libunique` was installed + The package `brasero` was installed + + Tracking all dependencies of packages: .. code-block:: bash @@ -123,26 +171,13 @@ Description: .. image:: https://badge.fury.io/py/slpkg.png - $ slpkg -t pylint - - +======================== - | pylint dependencies : - +======================== - | - | - -- 2 pysetuptools logilab-common - | - -- 1 astroid - - - Check if your packages is up to date (www.slackbuilds.org): .. code-block:: bash $ slpkg -c flashplayer-plugin - Searching for `flashplayer-plugin` from www.slackbuilds.org > Please wait ... + Searching `flashplayer-plugin` from slackbuilds.org ... New version is available !!! +================================================== @@ -151,14 +186,13 @@ Description: .. image:: https://badge.fury.io/py/slpkg.png $ slpkg -c ranger - Searching for `ranger` from www.slackbuilds.org > Please wait ... + Searching `ranger` from slackbuilds.org ... Your package is up to date $ slpkg -c termcolor - The package `termcolor` not found on your system @@ -167,60 +201,31 @@ Description: .. image:: https://badge.fury.io/py/slpkg.png .. code-block:: bash - This find the slackbuild , source, extra downloads and package requirements !!! - - $ slpkg -n brasero - Searching for `brasero` from www.slackbuilds.org > Please wait ... - - +================================================================================= - | The `brasero` found in --> http://slackbuilds.org/repository/14.1/system/brasero/ - +================================================================================= - - Download SlackBuild : http://slackbuilds.org/slackbuilds/14.1/system/brasero.tar.gz - Source Downloads : https://download.gnome.org/sources/brasero/3.11/brasero-3.11.3.tar.xz - Extra Downloads : - Package requirements : libunique gst1-plugins-bad - - Download this package [y/n] - - - And try again: - - - .. code-block:: bash - $ slpkg -n bitfighter - Searching for `bitfighter` from www.slackbuilds.org > Please wait ... - - +====================================================================================== - | The `bitfighter` found in --> http://slackbuilds.org/repository/14.1/games/bitfighter/ - +====================================================================================== - - Download SlackBuild : http://slackbuilds.org/slackbuilds/14.1/games/bitfighter.tar.gz - Source Downloads : http://bitfighter.org/files/bitfighter-019c.tar.gz - Extra Downloads : https://bitfighter.googlecode.com/files/classic_level_pack.zip - Package requirements : OpenAL SDL2 speex libmodplug - - Download this package [y/n] - - - - $ slpkg -n termcolor - Searching for `termcolor` from www.slackbuilds.org > Please wait ... - - +====================================================================================== - | The `termcolor` found in --> http://slackbuilds.org/repository/14.1/python/termcolor/ - +====================================================================================== - - Download SlackBuild : http://slackbuilds.org/slackbuilds/14.1/python/termcolor.tar.gz - Source Downloads : https://pypi.python.org/packages/source/t/termcolor/termcolor-1.1.0.tar.gz - Extra Downloads : - Package requirements : - - Download this package [y/n] - + Searching `bitfighter` from slackbuilds.org ... ++======================================================================================= + | The `bitfighter` found in --> +http://slackbuilds.org/repository/14.1/games/bitfighter/ + ++======================================================================================= + | Download SlackBuild : +http://slackbuilds.org/slackbuilds/14.1/games/bitfighter.tar.gz + | Source Downloads : http://bitfighter.org/files/bitfighter-019c.tar.gz + | Extra Downloads : +https://bitfighter.googlecode.com/files/classic_level_pack.zip + | Package requirements : OpenAL SDL2 speex libmodplug + ++======================================================================================= + README View the README file + SlackBuild View the SlackBuild file + Info View the Info file + Download Download this package + Build Download and build this package + + _ + Auto build tool to build package: @@ -231,7 +236,7 @@ Description: .. image:: https://badge.fury.io/py/slpkg.png Two files termcolor.tar.gz and termcolor-1.1.0.tar.gz must be in the same directory. - $ slpkg -s termcolor.tar.gz termcolor-1.1.0.tar.gz + $ slpkg -a termcolor.tar.gz termcolor-1.1.0.tar.gz termcolor/ termcolor/slack-desc @@ -256,10 +261,13 @@ Description: .. image:: https://badge.fury.io/py/slpkg.png creating /tmp/SBo/package-termcolor/usr/lib64 creating /tmp/SBo/package-termcolor/usr/lib64/python2.7 creating /tmp/SBo/package-termcolor/usr/lib64/python2.7/site-packages - copying build/lib/termcolor.py -> /tmp/SBo/package-termcolor/usr/lib64/python2.7/site-packages - byte-compiling /tmp/SBo/package-termcolor/usr/lib64/python2.7/site-packages/termcolor.py to termcolor.pyc + copying build/lib/termcolor.py -> +/tmp/SBo/package-termcolor/usr/lib64/python2.7/site-packages + byte-compiling +/tmp/SBo/package-termcolor/usr/lib64/python2.7/site-packages/termcolor.py to termcolor.pyc running install_egg_info - Writing /tmp/SBo/package-termcolor/usr/lib64/python2.7/site-packages/termcolor-1.1.0-py2.7.egg-info + Writing +/tmp/SBo/package-termcolor/usr/lib64/python2.7/site-packages/termcolor-1.1.0-py2.7.egg-info Slackware package maker, version 3.14159. @@ -307,9 +315,11 @@ Description: .. image:: https://badge.fury.io/py/slpkg.png $ slpkg -u /tmp/termcolor-1.1.0-x86_64-1_SBo.tgz - +============================================================================== + ++============================================================================== | Installing new package ./termcolor-1.1.0-x86_64-1_SBo.tgz - +============================================================================== + ++============================================================================== Verifying package termcolor-1.1.0-x86_64-1_SBo.tgz. Installing package termcolor-1.1.0-x86_64-1_SBo.tgz: @@ -414,17 +424,23 @@ Description: .. image:: https://badge.fury.io/py/slpkg.png --> Deleting /usr/doc/termcolor-1.1.0/PKG-INFO --> Deleting /usr/doc/termcolor-1.1.0/README.rst --> Deleting /usr/doc/termcolor-1.1.0/termcolor.SlackBuild - --> Deleting /usr/lib64/python2.7/site-packages/termcolor-1.1.0-py2.7.egg-info + --> Deleting +/usr/lib64/python2.7/site-packages/termcolor-1.1.0-py2.7.egg-info --> Deleting /usr/lib64/python2.7/site-packages/termcolor.py --> Deleting /usr/lib64/python2.7/site-packages/termcolor.pyc - --> Deleting /usr/lib64/python3.3/site-packages/__pycache__/termcolor.cpython-33.pyc - --> Deleting /usr/lib64/python3.3/site-packages/termcolor-1.1.0-py3.3.egg-info + --> Deleting +/usr/lib64/python3.3/site-packages/__pycache__/termcolor.cpython-33.pyc + --> Deleting +/usr/lib64/python3.3/site-packages/termcolor-1.1.0-py3.3.egg-info --> Deleting /usr/lib64/python3.3/site-packages/termcolor.py - --> Deleting empty directory /usr/lib64/python3.3/site-packages/__pycache__/ - WARNING: Unique directory /usr/lib64/python3.3/site-packages/ contains new files + --> Deleting empty directory +/usr/lib64/python3.3/site-packages/__pycache__/ + WARNING: Unique directory /usr/lib64/python3.3/site-packages/ contains new +files WARNING: Unique directory /usr/lib64/python3.3/ contains new files --> Deleting empty directory /usr/doc/termcolor-1.1.0/ - Done ... + + The package `termcolor` removed $ slpkg -f termcolor lua rar @@ -444,13 +460,16 @@ Description: .. image:: https://badge.fury.io/py/slpkg.png .. code-block:: bash $ man slpkg -Keywords: slackware,build,upgrade,install,remove,find,slackpkg,terminal Classifier: Development Status :: 3 - Alpha Classifier: Environment :: Console Classifier: License :: OSI Approved :: GNU General Public License v3 (GPLv3) +Classifier: Operating System :: POSIX Classifier: Operating System :: POSIX :: Linux Classifier: Operating System :: Unix +Classifier: Programming Language :: Python Classifier: Programming Language :: Python :: 2.7 -Classifier: Topic :: System -Classifier: Topic :: System :: Operating System +Classifier: Programming Language :: Unix Shell +Classifier: Topic :: System :: Installation/Setup Classifier: Topic :: Utilities + + diff --git a/bin/slpkg b/bin/slpkg index 64fcce6d..98f94525 100755 --- a/bin/slpkg +++ b/bin/slpkg @@ -51,7 +51,7 @@ import subprocess __author__ = "dslackw" -__version__ = "1.4.5" +__version__ = "1.4.6" __license__ = "GNU General Public License v3 (GPLv3)" __email__ = "d.zlatanidis@gmail.com" @@ -61,8 +61,8 @@ uname = os.uname() arch = (uname[4]) -# SBo fietype packages -SBo_arch = "-" + arch + "-" +# SBo fietype binary packages for install +SBo_arch = "*" SBo_tag = "?_SBo" SBo_filetype = ".tgz" @@ -758,8 +758,8 @@ def SBo_build(name): source = files[1] build_package(script, source) - install_pkg = tmp + pkg_for_install[i] + SBo_arch + SBo_tag + SBo_filetype - os.system("upgradepkg --install-new {}".format(install_pkg)) + install_pkg = tmp + pkg_for_install[i] + SBo_arch + SBo_tag + SBo_filetype + os.system("upgradepkg --install-new {}".format(install_pkg)) for j in range(0, 2): files.pop(0) @@ -807,7 +807,7 @@ def pkg_reinstall(name): # uninstall package def pkg_remove(name): s_user(getpass.getuser()) - print ("{}!!! WARNING !!!{}".format(colors.YELLOW, colors.ENDC)) + print ("{}!!! WARNING !!!{}".format(colors.RED, colors.ENDC)) remove_pkg = raw_input("Are you sure to remove this package(s) [y/n] ") print if remove_pkg == "y" or remove_pkg == "Y": diff --git a/setup.py b/setup.py index 488b7080..033de57b 100644 --- a/setup.py +++ b/setup.py @@ -7,7 +7,7 @@ from distutils.core import setup setup( name = 'slpkg', - version = "1.4.5", + version = "1.4.6", description = "Python tool to manage Slackware packages", keywords = ["slackware", "slpkg", "upgrade", "install", "remove", "view", "slackpkg", "tool"],