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

diff --git a/functions.sh b/functions.sh
index 520007e..f5326b9 100644
--- a/functions.sh
+++ b/functions.sh
@@ -173,7 +173,9 @@ cp_backup_conffile() {
       did=1
     fi
   fi
-  
+
+  [ -z "$check" ] && return 0
+
   if [ "$check" -a "$did" ]; then
     return 0
   else
@@ -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
 }