# HG changeset patch
# User Pascal Bellard <pascal.bellard@slitaz.org>
# Date 1217411475 0
# Node ID db7e865c0a118e160c0d16ddecb5804ec383898b
# Parent  76d09109221b194849b32f817a50ab9a4247d10a
tazpkgbox: can edit config files

diff -r 76d09109221b -r db7e865c0a11 lib/tazpkgbox/package_infos
--- a/lib/tazpkgbox/package_infos	Tue Jul 29 08:53:01 2008 +0000
+++ b/lib/tazpkgbox/package_infos	Wed Jul 30 09:51:15 2008 +0000
@@ -8,11 +8,19 @@
 PKG=`cat /tmp/tazpkgbox/pkg | sed s/" "/""/g`
 
 if [ "$1" = "list_files" ]; then
-	tazpkg list-files $2 | awk '
-BEGIN { ls=0 } {
-  if (/^===/) ls=1-ls;
-  else if (ls) system("stat -c \"%A|%U|%G|%s|%n\" " $0);
-}'
+	AWK_FILTER='BEGIN { ls=0 } { if (/^===/) ls=1-ls; else if (ls) print; }'
+	CONF_FILES="$(tazpkg list-config $2 | awk "$AWK_FILTER")"
+	tazpkg list-files $2 | awk "$AWK_FILTER" | while read file; do
+		echo -n "$(stat -c "%A|%U|%G|%s|$type %n|" "$file")"
+		if [ -L "$file" ]; then
+			echo -n "$(readlink "$file")"
+		elif [ -f "$file" ]; then
+			case "$CONF_FILES" in
+			*$file*) echo -n "[configuration file]";;
+			esac
+		fi
+		echo ""
+	done
 	exit 0
 fi
 
@@ -25,10 +33,12 @@
 export LIST_FILES="
 <window title=\"$PKG files\" icon-name=\"system-file-manager\">
   <vbox>
-	<tree>
+	<tree exported_column=\"4\">
+		<variable>FILE</variable>
 		<width>600</width><height>160</height>
-		<label>Access | User | Group | Size | Name</label>
+		<label>Access | User | Group | Size | Name | Target</label>
 		<input> $0 list_files $PKG </input>
+		<action>tazpkg list-config $PKG | grep -q ^\$FILE$ && leafpad \$FILE</action>
 	</tree>
 	<hbox>
 		<button>
diff -r 76d09109221b -r db7e865c0a11 tazpkg
--- a/tazpkg	Tue Jul 29 08:53:01 2008 +0000
+++ b/tazpkg	Wed Jul 30 09:51:15 2008 +0000
@@ -1121,10 +1121,10 @@
 			for i in $INSTALLED/*/volatile.cpio.gz; do 
 				zcat $i | cpio -id > /dev/null
 				find * -type f | while read file; do
-					echo -n "/$file|"
+					echo -n "$(stat -c "%A|%U|%G|%s|" /$file)"
 					cmp $file /$file > /dev/null 2>&1 || \
 						echo -n "$(stat -c "%.16y" /$file)"
-					stat -c "|%A|%s|%U|%G" /$file
+					echo "|/$file"
 				done
 				rm -rf *
 			done | sed 's|  |  /|'
@@ -1134,9 +1134,17 @@
 			echo ""
 			echo -e "\033[1mConfiguration files"
 			echo "================================================================================"
-			for i in $INSTALLED/*/volatile.cpio.gz; do 
-				zcat $i | cpio -t | grep -v "[0-9]* blocks"
-			done | sed 's|^|/|' | sort
+			if [ -n "$2" ]; then
+				for i in $INSTALLED/$2/volatile.cpio.gz; do 
+					[ -f "$i" ] || continue
+					zcat $i | cpio -t | grep -v "[0-9]* blocks"
+				done | sed 's|^|/|' | sort
+			else
+				for i in $INSTALLED/*/volatile.cpio.gz; do 
+					[ -f "$i" ] || continue
+					zcat $i | cpio -t | grep -v "[0-9]* blocks"
+				done | sed 's|^|/|' | sort
+			fi
 			echo "================================================================================"
 			echo ""
 		fi
diff -r 76d09109221b -r db7e865c0a11 tazpkgbox
--- a/tazpkgbox	Tue Jul 29 08:53:01 2008 +0000
+++ b/tazpkgbox	Wed Jul 30 09:51:15 2008 +0000
@@ -75,10 +75,10 @@
 export LIST_CONFIG_FILES='
 <window title="configuration files" icon-name="system-file-manager">
   <vbox>
-	<tree>
-		<width>630</width><height>160</height>
+	<tree exported_column="5">
+		<width>560</width><height>160</height>
 		<variable>CONF_FILE</variable>
-		<label>Name | Update Date | Access | Size | User | Group</label>
+		<label>Access | User | Group | Size | Update Date | Name</label>
 		<input>tazpkg list-config --box</input>
 		<action>leafpad $CONF_FILE</action>
 	</tree>
@@ -309,7 +309,7 @@
 
 	<vbox>
 		<frame Cache directory>
-			<text use-markup="true" width-chars="60">
+			<text use-markup="true" width-chars="60" wrap="false">
 				<label>
 "The cache directory is used to store downloaded or repacked packages."
 				</label>
@@ -393,8 +393,8 @@
 	</notebook>
 
 	<hbox>
-		<text>
-			<input>echo "Packages: `ls /var/lib/tazpkg/installed | wc -l` installed, `cat /var/lib/tazpkg/packages.list | wc -l` mirrored, `cat /var/lib/tazpkg/upradable-packages.list 2> /dev/null | wc -l` to upgrade "</input>
+		<text wrap="false">
+			<input>installed=`ls /var/lib/tazpkg/installed | wc -l`; mirrored=`cat /var/lib/tazpkg/packages.list | wc -l`; echo "Packages: $installed installed, $(($mirrored - $installed)) installable, $mirrored mirrored, `cat /var/lib/tazpkg/upradable-packages.list 2> /dev/null | wc -l` to upgrade "</input>
 			<variable>PKG_STATS</variable>
 		</text>
 	</hbox>