# HG changeset patch
# User Aleksej Bobylev <al.bobylev@gmail.com>
# Date 1447037642 -7200
# Node ID 21ac83abe572a0d431161645886e1b975159f334
# Parent  52914628669fdce85a5c97a72a63ae2297e6a97b
cache: fix working; install: install official conf.files if destination is absent; tazpkg-notify: change icons

diff -r 52914628669f -r 21ac83abe572 modules/cache
--- a/modules/cache	Sun Nov 08 12:01:39 2015 +0100
+++ b/modules/cache	Mon Nov 09 04:54:02 2015 +0200
@@ -15,7 +15,7 @@
 
 case $1 in
 	clean)
-		num=$(find "$CACHE_DIR" -name *.tazpkg | wc -l)
+		num=$(find "$CACHE_DIR" -name '*.tazpkg' | wc -l)
 		size=$(du -hs "$CACHE_DIR" | cut -f1 | sed 's|\.0||')
 		[ "$num" -eq 0 ] && size="0K"
 
@@ -29,4 +29,4 @@
 			'%s files removed from cache (%s).' "$num" \
 			"$(colorize 32 "$num")" "$size")"
 		;;
-esac
\ No newline at end of file
+esac
diff -r 52914628669f -r 21ac83abe572 modules/install
--- a/modules/install	Sun Nov 08 12:01:39 2015 +0100
+++ b/modules/install	Mon Nov 09 04:54:02 2015 +0200
@@ -447,9 +447,14 @@
 			debug "  no '--newconf': clean official config files"
 			# Keep user configuration files: remove "official" from fs tree
 			for config_file in $CONFIG_FILES; do
-				debug "    remove '$config_file'"
-				[ -d "fs$config_file" ] && rm -r "fs$config_file"
-				[ -e "fs$config_file" ] && rm    "fs$config_file"
+				for config_file_official in $(find "fs$config_file" ! -type d | sed 's|^fs||'); do
+					if [ -e "$root$config_file_official" ]; then
+						debug "    official '$config_file_official' will be skipped"
+						rm "fs$config_file_official"
+					else
+						debug "    official '$config_file_official' will be written"
+					fi
+				done
 			done
 		fi
 		# always '[ Done ]' status, unless '--newconf' is passed or not
diff -r 52914628669f -r 21ac83abe572 tazpkg-notify
--- a/tazpkg-notify	Sun Nov 08 12:01:39 2015 +0100
+++ b/tazpkg-notify	Mon Nov 09 04:54:02 2015 +0200
@@ -42,7 +42,7 @@
 	exec 3<> $fifo
 
 	# Notification icon
-	yad --notification --listen --image='TazPkg' \
+	yad --notification --listen --image='software-update-available' \
 		--text="$(_ 'Checking packages lists - %s' "$text")" <&3
 
 	# Clean-up
@@ -55,9 +55,9 @@
 menu() {
 	cat << EOT
 menu:\
-$(_n 'My packages'       )!tazpanel pkgs#list!TazPkg|\
-$(_n 'Recharge lists'    )!tazbox su tazpanel pkgs#recharge!tazpkg-up|\
-$(_n 'Check upgrade'     )!tazbox su tazpanel pkgs#up!tazpkg-up|\
+$(_n 'My packages'       )!tazpanel pkgs#list!package-x-generic|\
+$(_n 'Recharge lists'    )!tazbox su tazpanel pkgs#recharge!system-software-update|\
+$(_n 'Check upgrade'     )!tazbox su tazpanel pkgs#up!system-software-install|\
 $(_n 'TazPkg SHell'      )!terminal -e tazpkg shell!utilities-terminal|\
 $(_n 'TazPkg manual'     )!tazweb --notoolbar $doc!slitaz-doc|\
 $(_n 'Close notification')!quit!gtk-close
@@ -83,7 +83,7 @@
 			tooltip="$(_ 'No packages list found - %s' "$text")"
 			(echo "action:tazbox su tazpanel pkgs#recharge"
 			 echo "tooltip:$tooltip"
-			 echo "icon:tazpkg-up") > $fifo
+			 echo "icon:software-update-urgent") > $fifo
 			exit 0
 		fi
 
@@ -93,7 +93,7 @@
 			(echo "action:tazbox su tazpanel pkgs#recharge"
 			 echo "action:quit"
 			 echo "tooltip:$tooltip"
-			 echo "icon:tazpkg-up") > $fifo
+			 echo "icon:software-update-urgent") > $fifo
 			exit 0
 		fi
 
@@ -105,7 +105,7 @@
 				"<b>$up</b>")"
 			(echo "action:tazbox su tazpanel pkgs#up"
 			 echo "tooltip:$tooltip"
-			 echo "icon:tazpkg-up") > $fifo
+			 echo "icon:software-update-urgent") > $fifo
 			exit 0
 		fi