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

diff --git a/functions.sh b/functions.sh
index 520007e..4390978 100644
--- a/functions.sh
+++ b/functions.sh
@@ -1,6 +1,13 @@
+# Initialize "public" CP_ECHO_RETURN variable once
+if [ -z "$_CP_INIT_ECHO_RETURN" ]; then
+  _CP_INIT_ECHO_RETURN=1
+  CP_ECHO_RETURN=""
+fi
+
 # by ddzeko & ico, Fri, 18 Mar 2005 14:44:08 +0100
 cp_get_ifaddr() {
   [ "$CP_SCRIPT_DEBUG" ] && set -vx
+
   local ifaddr interface echo_return
   echo_return="$CP_ECHO_RETURN" # since we're making our own calls
   # in our own way we need to set CP_ECHO_RETURN the way we want it
@@ -36,6 +43,7 @@ cp_get_ifaddr() {
 # by ddzeko & ico, Fri, 18 Mar 2005 14:44:08 +0100
 cp_get_ifmask() {
   [ "$CP_SCRIPT_DEBUG" ] && set -vx
+
   local ifmask interface echo_return
   echo_return="$CP_ECHO_RETURN" # since we're making our own calls
   # in our own way we need to set CP_ECHO_RETURN the way we want it
@@ -70,28 +78,32 @@ cp_get_ifmask() {
 
 # by ddzeko, Mon, 21 Mar 2005 07:00:22 +0100
 cp_get_ifdefault() {
+  [ "$CP_SCRIPT_DEBUG" ] && set -vx
+
   local echo_return
   echo_return="$CP_ECHO_RETURN" # since we're making our own calls
   # in our own way we need to set CP_ECHO_RETURN the way we want it
   # but preserving initial state so it could be used afterwards
   CP_ECHO_RETURN=""
 
-  [ "$CP_SCRIPT_DEBUG" ] && set -vx
   RET=""
   case $1 in
     dev)  RET=`route -n | awk '/^0.0.0.0/{print $8}'` ;;
     addr) RET=`route -n | awk '/^0.0.0.0/{print $2}'` ;;
     *)    echo "cp_get_ifdefault: Argument required (dev or addr)" >&2 ;;
   esac
+
   [ -z "$RET" -a "$1" ] && echo "cp_get_ifdefault: No default route" >&2
+
   [ -z "$echo_return" ] || echo $RET
   CP_ECHO_RETURN="$echo_return"
-  [ -z "$RET" ] && return 1
+  [ -n "$RET" ] || return 1
 }
 
 # by ico, Tue, 15 Mar 2005 14:04:21 +0100
 cp_get_netaddr() {
   [ "$CP_SCRIPT_DEBUG" ] && set -vx
+
   local netmask ipaddress interface cidr echo_return
   echo_return="$CP_ECHO_RETURN" # since we're making our own calls
   # in our own way we need to set CP_ECHO_RETURN the way we want it
@@ -138,12 +150,15 @@ cp_get_netaddr() {
 }
 
 cp_check_and_backup() {
+  [ "$CP_SCRIPT_DEBUG" ] && set -vx
+
   cp_backup_conffile -r "$@"
 }
 
 # by ico, Tue, 15 Mar 2005 14:04:21 +0100
 cp_backup_conffile() {
   [ "$CP_SCRIPT_DEBUG" ] && set -vx
+
   local file_bak check did
   
   if [ "x$1" = "x-r" ]; then
@@ -173,11 +188,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
 }
 
@@ -190,9 +207,9 @@ cp_backup_conffile() {
 #
 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 +226,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,13 +238,14 @@ cp_check_and_sed() {
     fi
     ret=0
   done
-  [ "$ret" -eq 2 -a "$grepret"] && ret=1 || true
+  [ "$ret" -eq 2 -a "$grepret" ] && ret=1
   return $ret
 }
 
 # by jelly, Sun, 20 Mar 2005 20:12:19 +0100
 cp_echo () {
   [ "$CP_SCRIPT_DEBUG" ] && set -vx
+
   if [ "x$1" = "x-mailonly" -o "x$1" = "x-m" ]; then
     shift
   else   
@@ -243,13 +261,18 @@ cp_echo () {
 # by jelly, Sun, 20 Mar 2005 20:12:19 +0100
 cp_mail () {
   [ "$CP_SCRIPT_DEBUG" ] && set -vx
+
   local pkg version quiet
   if [ "x$1" = "x-q" ]; then
     quiet=1
     shift
   fi
-  [ -n "$1" ] && pkg="$1"       # barf if no package
-  [ -n "$2" ] && version=" $2" || true
+  if [ -n "$1" ]; then
+    pkg="$1"
+  else
+    return 1 # must have at least the package name as argument
+  fi
+  [ -n "$2" ] && version=" $2"
   if [ "$(echo $CP_NOTICE|wc -w)" -gt 0 ]; then
     [ -n "$quiet" ] || echo "Mailing upgrade output to root."
     CP_NOTICE="From: $pkg postinst script <root>
@@ -274,6 +297,7 @@ ${CP_NOTICE}----------"
 # by ddzeko, Mon, 21 Mar 2005 11:31:59 +0100
 cp_mv () {
   [ "$CP_SCRIPT_DEBUG" ] && set -vx
+
   local new old
   if [ -z "$2" ]; then
     return 1
@@ -330,6 +354,8 @@ cp_yes_no () {
 #     instead of some gibberish error message that our script does
 #     not expect
 cp_db_get() {
+  [ "$CP_SCRIPT_DEBUG" ] && set -vx
+
   local var
   var="$1"
   
@@ -354,14 +380,14 @@ cp_db_get() {
 
 # by ico, Wed, 20 Apr 2005 21:09:54 +0200
 cp_get_ldap_suffix() {
+  [ "$CP_SCRIPT_DEBUG" ] && set -vx
+
   local echo_return
   echo_return="$CP_ECHO_RETURN" # since we're making our own calls
   # in our own way we need to set CP_ECHO_RETURN the way we want it
   # but preserving initial state so it could be used afterwards
   CP_ECHO_RETURN=""
 
-  [ "$CP_SCRIPT_DEBUG" ] && set -vx
-
   if [ ! -f /etc/ldap/slapd.conf ]; then
     echo "cp_get_ldap_suffix: /etc/ldap/slapd.conf: No such file" >&2
     return 2
@@ -384,14 +410,14 @@ cp_get_ldap_suffix() {
 
 # by ico, Wed, 20 Apr 2005 21:09:54 +0200
 cp_get_ldap_realm() {
+  [ "$CP_SCRIPT_DEBUG" ] && set -vx
+
   local echo_return
   echo_return="$CP_ECHO_RETURN" # since we're making our own calls
   # in our own way we need to set CP_ECHO_RETURN the way we want it
   # but preserving initial state so it could be used afterwards
   CP_ECHO_RETURN=""
 
-  [ "$CP_SCRIPT_DEBUG" ] && set -vx
-
   if [ ! -f /etc/ldap/slapd.conf ]; then
     echo "cp_get_ldap_realm: /etc/ldap/slapd.conf: No such file" >&2
     return 2