tazpkg diff modules/install @ 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 8a73a58ed3cb
children 602ed53fa812
line diff
     1.1 --- a/modules/install	Fri Oct 09 13:14:01 2015 +0300
     1.2 +++ b/modules/install	Mon Nov 09 04:54:02 2015 +0200
     1.3 @@ -447,9 +447,14 @@
     1.4  			debug "  no '--newconf': clean official config files"
     1.5  			# Keep user configuration files: remove "official" from fs tree
     1.6  			for config_file in $CONFIG_FILES; do
     1.7 -				debug "    remove '$config_file'"
     1.8 -				[ -d "fs$config_file" ] && rm -r "fs$config_file"
     1.9 -				[ -e "fs$config_file" ] && rm    "fs$config_file"
    1.10 +				for config_file_official in $(find "fs$config_file" ! -type d | sed 's|^fs||'); do
    1.11 +					if [ -e "$root$config_file_official" ]; then
    1.12 +						debug "    official '$config_file_official' will be skipped"
    1.13 +						rm "fs$config_file_official"
    1.14 +					else
    1.15 +						debug "    official '$config_file_official' will be written"
    1.16 +					fi
    1.17 +				done
    1.18  			done
    1.19  		fi
    1.20  		# always '[ Done ]' status, unless '--newconf' is passed or not