r73: mali cleanup u manualu

[carnet-tools-cn.git] / functions.sh

diff --git a/functions.sh b/functions.sh
index 85e9dd9..28877c5 100644 (file)
--- 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
 }
 
@@ -191,6 +193,9 @@ cp_backup_conffile() {
 cp_check_and_sed() {
   [ "$CP_SCRIPT_DEBUG" ] && set -vx
   local s sedcmd grepret ret i
+  if [ -z "$3" ]; then
+    return 1
+  fi
   s="$1"
   shift
   sedcmd="$1"
@@ -205,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
@@ -217,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
 }