X-Git-Url: http://ftp.carnet.hr/carnet-debian/scm?a=blobdiff_plain;f=functions.sh;h=f2fc9a1add4f147e2433d6400ff8ff014fcb66e5;hb=b6374f775ed04f3c9767d19a364ad0994a94ac4f;hp=2f91b8251921536162571d3e75190c0e4afb3ce3;hpb=4750707795d8a2c3a518b3f14414cd4a3c05aa70;p=carnet-tools-cn.git

diff --git a/functions.sh b/functions.sh
index 2f91b82..f2fc9a1 100644
--- a/functions.sh
+++ b/functions.sh
@@ -179,11 +179,13 @@ cp_check_and_sed() {
   for i in "$@"
   do
     [ -e "$i" ]        || continue
-    egrep -q "$s" "$i" || continue
+    if egrep -q "$s" "$i"; then
+      continue
+    fi
     [ -h "$i" ]        && i=$(readlink -f "$i")
     sed "$sedcmd" "$i" > "$i.dpkg-tmp"
     if ! cmp -s "$i" "$i.dpkg-tmp" 2>&1 >/dev/null; then
-      cp_safe_file_replace "$i.dpkg-tmp" "$i"
+      cp_mv "$i.dpkg-tmp" "$i"
     else
       rm "$i.dpkg-tmp"
     fi
@@ -239,7 +241,7 @@ ${CP_NOTICE}----------"
 }
 
 # by ddzeko, Mon, 21 Mar 2005 11:31:59 +0100
-cp_safe_file_replace () {
+cp_mv () {
   [ "$CP_SCRIPT_DEBUG" ] && set -vx
   local new old
   if [ -z "$2" ]; then