# HG changeset patch
# User Christophe Lincoln <pankso@slitaz.org>
# Date 1396054470 -3600
# Node ID 9378152c7e2c8ac7487fbc55577076dab597bc5f
# Parent  db947fd832be0ad25ad4d990da080adedc04bf7b
Add spk-find, update doc

diff -r db947fd832be -r 9378152c7e2c Makefile
--- a/Makefile	Sat Mar 29 00:54:26 2014 +0100
+++ b/Makefile	Sat Mar 29 01:54:30 2014 +0100
@@ -48,6 +48,7 @@
 	install -m 0755 -d $(DESTDIR)$(PREFIX)/sbin
 	install -m 0755 spk $(DESTDIR)$(PREFIX)/bin
 	install -m 0755 spk-ls $(DESTDIR)$(PREFIX)/bin
+	install -m 0755 spk-find $(DESTDIR)$(PREFIX)/bin
 	install -m 0755 spk-rm $(DESTDIR)$(PREFIX)/sbin
 	install -m 0755 spk-add $(DESTDIR)$(PREFIX)/sbin
 	install -m 0755 spk-mirror $(DESTDIR)$(PREFIX)/sbin
diff -r db947fd832be -r 9378152c7e2c doc/spk.en.html
--- a/doc/spk.en.html	Sat Mar 29 00:54:26 2014 +0100
+++ b/doc/spk.en.html	Sat Mar 29 01:54:30 2014 +0100
@@ -73,6 +73,25 @@
 # spk-up package1 package2 ...
 </pre>
 
+<h3>Find packages</h3>
+<p>
+	The spk-find util with grep into a full packages list available on the
+	mirror:
+</p>
+<pre>
+# spk-find package
+</pre>
+
+<h3>List packages &amp; files</h3>
+<p>
+	Spk-ls let you get the list of installed or mirrored packages as well 
+	has the list of files installed by a package:
+</p>
+<pre>
+# spk-ls --short
+# spk-ls gcc-lib-base
+</pre>
+
 <!-- <h3></h3>
 <p>
 	
diff -r db947fd832be -r 9378152c7e2c spk-add
--- a/spk-add	Sat Mar 29 00:54:26 2014 +0100
+++ b/spk-add	Sat Mar 29 01:54:30 2014 +0100
@@ -383,7 +383,7 @@
 	case "$pkg" in
 		*.tazpkg|*.spk)
 			count=$(($count + 1))
-			install_local $pkg | log_install $pkg;;
+			install_local $pkg | log_install $pkg ;;
 		*.deb|.rpm)
 			echo "TODO: spk-convert then install" ;;
 		*.*) gettext "WARNING: Not a valid package:"; echo " $pkg" ;;
@@ -391,7 +391,7 @@
 		*)
 			[ "$forced" ] || check_installed $pkg
 			count=$(($count + 1))
-			install_web $pkg | log_install $pkg;;
+			install_web $pkg | log_install $pkg ;;
 	esac
 done
 
diff -r db947fd832be -r 9378152c7e2c spk-find
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/spk-find	Sat Mar 29 01:54:30 2014 +0100
@@ -0,0 +1,53 @@
+#!/bin/sh
+#
+# Spk-find - Find/search SliTaz packages and files. Read the README before
+# adding or modifying any code in spk!
+#
+# Copyright (C) SliTaz GNU/Linux - BSD License
+# Author: See AUTHORS files
+#
+. /usr/lib/slitaz/libspk.sh
+
+#
+# Quick cooded tool to have a simple find/search packages tool for people 
+# using spk toolkit. TODO: find files, find in pkg desc for patern, display
+# status (installed or not).
+#
+
+find="$1"
+count="/tmp/spk/count"
+mkdir -p $(dirname $count)
+
+#
+# Functions
+#
+
+# Help and usage
+usage() {
+	name=$(basename $0)
+	cat << EOT
+
+$(boldify $(gettext "Usage:")) $name [package]
+
+EOT
+	exit 0
+}
+
+case "$1" in
+	*help|usage) usage && exit 0 ;;
+esac
+
+newline
+boldify $(gettext "Spk find: $find")
+separator
+IFS="|"
+grep "$find" $pkgsdesc | while read pkg vers desc null
+do
+	echo "$pkg" >> $count
+	echo -n "$pkg"; indent 16 "$desc"
+done
+unset IFS
+separator
+boldify "Packages found: $(cat $count | wc -l)" && newline
+rm -rf $count
+exit 0
diff -r db947fd832be -r 9378152c7e2c spk-ls
--- a/spk-ls	Sat Mar 29 00:54:26 2014 +0100
+++ b/spk-ls	Sat Mar 29 01:54:30 2014 +0100
@@ -68,7 +68,7 @@
 					boldify $(gettext "Extra mirror")
 					if [ ! -f "$extra/packages.desc" ]; then
 						echo "URL: $(cat $extra/mirror)"
-						gettext "Missing:"; colorize 31" packages.desc"
+						gettext "Missing:"; colorize 31 " packages.desc"
 						continue
 					fi
 					separator