tazpkg rev 855
cache: fix working; install: install official conf.files if destination is absent; tazpkg-notify: change icons
author | Aleksej Bobylev <al.bobylev@gmail.com> |
---|---|
date | Mon Nov 09 04:54:02 2015 +0200 (2015-11-09) |
parents | 52914628669f |
children | 64537d742a00 |
files | modules/cache modules/install tazpkg-notify |
line diff
1.1 --- a/modules/cache Sun Nov 08 12:01:39 2015 +0100 1.2 +++ b/modules/cache Mon Nov 09 04:54:02 2015 +0200 1.3 @@ -15,7 +15,7 @@ 1.4 1.5 case $1 in 1.6 clean) 1.7 - num=$(find "$CACHE_DIR" -name *.tazpkg | wc -l) 1.8 + num=$(find "$CACHE_DIR" -name '*.tazpkg' | wc -l) 1.9 size=$(du -hs "$CACHE_DIR" | cut -f1 | sed 's|\.0||') 1.10 [ "$num" -eq 0 ] && size="0K" 1.11 1.12 @@ -29,4 +29,4 @@ 1.13 '%s files removed from cache (%s).' "$num" \ 1.14 "$(colorize 32 "$num")" "$size")" 1.15 ;; 1.16 -esac 1.17 \ No newline at end of file 1.18 +esac
2.1 --- a/modules/install Sun Nov 08 12:01:39 2015 +0100 2.2 +++ b/modules/install Mon Nov 09 04:54:02 2015 +0200 2.3 @@ -447,9 +447,14 @@ 2.4 debug " no '--newconf': clean official config files" 2.5 # Keep user configuration files: remove "official" from fs tree 2.6 for config_file in $CONFIG_FILES; do 2.7 - debug " remove '$config_file'" 2.8 - [ -d "fs$config_file" ] && rm -r "fs$config_file" 2.9 - [ -e "fs$config_file" ] && rm "fs$config_file" 2.10 + for config_file_official in $(find "fs$config_file" ! -type d | sed 's|^fs||'); do 2.11 + if [ -e "$root$config_file_official" ]; then 2.12 + debug " official '$config_file_official' will be skipped" 2.13 + rm "fs$config_file_official" 2.14 + else 2.15 + debug " official '$config_file_official' will be written" 2.16 + fi 2.17 + done 2.18 done 2.19 fi 2.20 # always '[ Done ]' status, unless '--newconf' is passed or not
3.1 --- a/tazpkg-notify Sun Nov 08 12:01:39 2015 +0100 3.2 +++ b/tazpkg-notify Mon Nov 09 04:54:02 2015 +0200 3.3 @@ -42,7 +42,7 @@ 3.4 exec 3<> $fifo 3.5 3.6 # Notification icon 3.7 - yad --notification --listen --image='TazPkg' \ 3.8 + yad --notification --listen --image='software-update-available' \ 3.9 --text="$(_ 'Checking packages lists - %s' "$text")" <&3 3.10 3.11 # Clean-up 3.12 @@ -55,9 +55,9 @@ 3.13 menu() { 3.14 cat << EOT 3.15 menu:\ 3.16 -$(_n 'My packages' )!tazpanel pkgs#list!TazPkg|\ 3.17 -$(_n 'Recharge lists' )!tazbox su tazpanel pkgs#recharge!tazpkg-up|\ 3.18 -$(_n 'Check upgrade' )!tazbox su tazpanel pkgs#up!tazpkg-up|\ 3.19 +$(_n 'My packages' )!tazpanel pkgs#list!package-x-generic|\ 3.20 +$(_n 'Recharge lists' )!tazbox su tazpanel pkgs#recharge!system-software-update|\ 3.21 +$(_n 'Check upgrade' )!tazbox su tazpanel pkgs#up!system-software-install|\ 3.22 $(_n 'TazPkg SHell' )!terminal -e tazpkg shell!utilities-terminal|\ 3.23 $(_n 'TazPkg manual' )!tazweb --notoolbar $doc!slitaz-doc|\ 3.24 $(_n 'Close notification')!quit!gtk-close 3.25 @@ -83,7 +83,7 @@ 3.26 tooltip="$(_ 'No packages list found - %s' "$text")" 3.27 (echo "action:tazbox su tazpanel pkgs#recharge" 3.28 echo "tooltip:$tooltip" 3.29 - echo "icon:tazpkg-up") > $fifo 3.30 + echo "icon:software-update-urgent") > $fifo 3.31 exit 0 3.32 fi 3.33 3.34 @@ -93,7 +93,7 @@ 3.35 (echo "action:tazbox su tazpanel pkgs#recharge" 3.36 echo "action:quit" 3.37 echo "tooltip:$tooltip" 3.38 - echo "icon:tazpkg-up") > $fifo 3.39 + echo "icon:software-update-urgent") > $fifo 3.40 exit 0 3.41 fi 3.42 3.43 @@ -105,7 +105,7 @@ 3.44 "<b>$up</b>")" 3.45 (echo "action:tazbox su tazpanel pkgs#up" 3.46 echo "tooltip:$tooltip" 3.47 - echo "icon:tazpkg-up") > $fifo 3.48 + echo "icon:software-update-urgent") > $fifo 3.49 exit 0 3.50 fi 3.51