X-Git-Url: http://ftp.carnet.hr/carnet-debian/scm?p=carnet-tools-cn.git;a=blobdiff_plain;f=functions.sh;h=28877c5a1849396ccfe7c09554237795f92581e8;hp=520007eeed2477a1d85264711bbf2f4fe6af1ee5;hb=78cf4902f1c46307ce7408229c40f67ecc3552ec;hpb=7034f689abd0368dc6eaa1440773d8f79d8fe98e

diff --git a/functions.sh b/functions.sh
index 520007e..28877c5 100644
--- a/functions.sh
+++ b/functions.sh
@@ -173,11 +173,13 @@ cp_backup_conffile() {
       did=1
     fi
   fi
-  
-  if [ "$check" -a "$did" ]; then
-    return 0
-  else
+
+  [ -z "$check" ] && return 0
+
+  if [ "$check" -a ! "$did" ]; then
     return 3
+  else
+    return 0
   fi
 }
 
@@ -192,7 +194,6 @@ cp_check_and_sed() {
   [ "$CP_SCRIPT_DEBUG" ] && set -vx
   local s sedcmd grepret ret i
   if [ -z "$3" ]; then
-    echo "Usage: cp_check_and_sed <regexp> <sed> <file> [file ...]" 2>&1 
     return 1
   fi
   s="$1"
@@ -209,7 +210,7 @@ cp_check_and_sed() {
     fi
     [ -h "$i" ]        && i=$(readlink -f "$i")
     sed "$sedcmd" "$i" > "$i.dpkg-tmp"
-    if [ ! "$?" = "0" ]; then
+    if [ $? -ne 0 ]; then
       rm "$i.dpkg-tmp"
       echo "cp_check_and_sed: Problem with sed" 1>&2
       return 5
@@ -221,7 +222,7 @@ cp_check_and_sed() {
     fi
     ret=0
   done
-  [ "$ret" -eq 2 -a "$grepret"] && ret=1 || true
+  [ "$ret" -eq 2 -a "$grepret" ] && ret=1 || true
   return $ret
 }