spk rev 135
Add spk-find, update doc
author | Christophe Lincoln <pankso@slitaz.org> |
---|---|
date | Sat Mar 29 01:54:30 2014 +0100 (2014-03-29) |
parents | db947fd832be |
children | aded92d8f7bf |
files | Makefile doc/spk.en.html spk-add spk-find spk-ls |
line diff
1.1 --- a/Makefile Sat Mar 29 00:54:26 2014 +0100 1.2 +++ b/Makefile Sat Mar 29 01:54:30 2014 +0100 1.3 @@ -48,6 +48,7 @@ 1.4 install -m 0755 -d $(DESTDIR)$(PREFIX)/sbin 1.5 install -m 0755 spk $(DESTDIR)$(PREFIX)/bin 1.6 install -m 0755 spk-ls $(DESTDIR)$(PREFIX)/bin 1.7 + install -m 0755 spk-find $(DESTDIR)$(PREFIX)/bin 1.8 install -m 0755 spk-rm $(DESTDIR)$(PREFIX)/sbin 1.9 install -m 0755 spk-add $(DESTDIR)$(PREFIX)/sbin 1.10 install -m 0755 spk-mirror $(DESTDIR)$(PREFIX)/sbin
2.1 --- a/doc/spk.en.html Sat Mar 29 00:54:26 2014 +0100 2.2 +++ b/doc/spk.en.html Sat Mar 29 01:54:30 2014 +0100 2.3 @@ -73,6 +73,25 @@ 2.4 # spk-up package1 package2 ... 2.5 </pre> 2.6 2.7 +<h3>Find packages</h3> 2.8 +<p> 2.9 + The spk-find util with grep into a full packages list available on the 2.10 + mirror: 2.11 +</p> 2.12 +<pre> 2.13 +# spk-find package 2.14 +</pre> 2.15 + 2.16 +<h3>List packages & files</h3> 2.17 +<p> 2.18 + Spk-ls let you get the list of installed or mirrored packages as well 2.19 + has the list of files installed by a package: 2.20 +</p> 2.21 +<pre> 2.22 +# spk-ls --short 2.23 +# spk-ls gcc-lib-base 2.24 +</pre> 2.25 + 2.26 <!-- <h3></h3> 2.27 <p> 2.28
3.1 --- a/spk-add Sat Mar 29 00:54:26 2014 +0100 3.2 +++ b/spk-add Sat Mar 29 01:54:30 2014 +0100 3.3 @@ -383,7 +383,7 @@ 3.4 case "$pkg" in 3.5 *.tazpkg|*.spk) 3.6 count=$(($count + 1)) 3.7 - install_local $pkg | log_install $pkg;; 3.8 + install_local $pkg | log_install $pkg ;; 3.9 *.deb|.rpm) 3.10 echo "TODO: spk-convert then install" ;; 3.11 *.*) gettext "WARNING: Not a valid package:"; echo " $pkg" ;; 3.12 @@ -391,7 +391,7 @@ 3.13 *) 3.14 [ "$forced" ] || check_installed $pkg 3.15 count=$(($count + 1)) 3.16 - install_web $pkg | log_install $pkg;; 3.17 + install_web $pkg | log_install $pkg ;; 3.18 esac 3.19 done 3.20
4.1 --- /dev/null Thu Jan 01 00:00:00 1970 +0000 4.2 +++ b/spk-find Sat Mar 29 01:54:30 2014 +0100 4.3 @@ -0,0 +1,53 @@ 4.4 +#!/bin/sh 4.5 +# 4.6 +# Spk-find - Find/search SliTaz packages and files. Read the README before 4.7 +# adding or modifying any code in spk! 4.8 +# 4.9 +# Copyright (C) SliTaz GNU/Linux - BSD License 4.10 +# Author: See AUTHORS files 4.11 +# 4.12 +. /usr/lib/slitaz/libspk.sh 4.13 + 4.14 +# 4.15 +# Quick cooded tool to have a simple find/search packages tool for people 4.16 +# using spk toolkit. TODO: find files, find in pkg desc for patern, display 4.17 +# status (installed or not). 4.18 +# 4.19 + 4.20 +find="$1" 4.21 +count="/tmp/spk/count" 4.22 +mkdir -p $(dirname $count) 4.23 + 4.24 +# 4.25 +# Functions 4.26 +# 4.27 + 4.28 +# Help and usage 4.29 +usage() { 4.30 + name=$(basename $0) 4.31 + cat << EOT 4.32 + 4.33 +$(boldify $(gettext "Usage:")) $name [package] 4.34 + 4.35 +EOT 4.36 + exit 0 4.37 +} 4.38 + 4.39 +case "$1" in 4.40 + *help|usage) usage && exit 0 ;; 4.41 +esac 4.42 + 4.43 +newline 4.44 +boldify $(gettext "Spk find: $find") 4.45 +separator 4.46 +IFS="|" 4.47 +grep "$find" $pkgsdesc | while read pkg vers desc null 4.48 +do 4.49 + echo "$pkg" >> $count 4.50 + echo -n "$pkg"; indent 16 "$desc" 4.51 +done 4.52 +unset IFS 4.53 +separator 4.54 +boldify "Packages found: $(cat $count | wc -l)" && newline 4.55 +rm -rf $count 4.56 +exit 0
5.1 --- a/spk-ls Sat Mar 29 00:54:26 2014 +0100 5.2 +++ b/spk-ls Sat Mar 29 01:54:30 2014 +0100 5.3 @@ -68,7 +68,7 @@ 5.4 boldify $(gettext "Extra mirror") 5.5 if [ ! -f "$extra/packages.desc" ]; then 5.6 echo "URL: $(cat $extra/mirror)" 5.7 - gettext "Missing:"; colorize 31" packages.desc" 5.8 + gettext "Missing:"; colorize 31 " packages.desc" 5.9 continue 5.10 fi 5.11 separator