X-Git-Url: http://ftp.carnet.hr/carnet-debian/scm?a=blobdiff_plain;f=functions.sh;h=47ad62f0e3be17026aac7ff9fee678468bb1e67a;hb=53e4a56a246421d5ec52c23135661e9b7d7ddb63;hp=2094e0a066e4007a0e2ace6a1840aa9bb82a58a3;hpb=f04eccdf6856210fdac3eaabf4f98134945e3060;p=carnet-tools-cn.git

diff --git a/functions.sh b/functions.sh
index 2094e0a..47ad62f 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
@@ -17,13 +24,13 @@ cp_get_ifaddr() {
   if ! ifconfig $interface 2> /dev/null >> /dev/null; then
     echo "cp_get_ifaddr: $interface: No such interface" 1>&2
     CP_ECHO_RETURN="$echo_return"
-    return 1
+    return 2
   fi
 
   ifaddr="`/sbin/ifconfig $interface | awk '/inet/{ printf("%s\n",substr($2,index($2,":")+1)) }'`"
 
   if [ -z $ifaddr ]; then
-    echo "cp_get_ifaddr: $interface: No such ipaddress" 1>&2
+    echo "cp_get_ifaddr: $interface: No ip address found" 1>&2
     CP_ECHO_RETURN="$echo_return"
     return 1
   fi
@@ -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
@@ -58,7 +66,7 @@ cp_get_ifmask() {
   ifmask="`/sbin/ifconfig $interface | awk '/Mask/{if($3~/Mask/)a=$3;else if ($4~/Mask/)a=$4;printf ("%s\n", substr(a,index(a,":")+1))}'`"
 
   if [ -z "$ifmask" ]; then
-    echo "cp_get_ifmask: $interface: No such netmask" 1>&2
+    echo "cp_get_ifmask: $interface: No netmask found" 1>&2
     CP_ECHO_RETURN="$echo_return"
     return 1
   fi
@@ -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
@@ -114,14 +126,14 @@ cp_get_netaddr() {
   cp_get_ifaddr "$interface"
   ipaddress="$RET"
   if [ -z $ipaddress ]; then
-    echo "cp_get_netaddr: $interface: No such ipaddress" 1>&2
+    echo "cp_get_netaddr: $interface: No IP address found" 1>&2
     CP_ECHO_RETURN="$echo_return"
     return 1
   fi
   cp_get_ifmask "$interface"
   netmask="$RET"
   if [ -z $netmask ]; then
-    echo "cp_get_netaddr: $interface: No such netmask" 1>&2
+    echo "cp_get_netaddr: $interface: No netmask found" 1>&2
     CP_ECHO_RETURN="$echo_return"
     return 1
   fi
@@ -137,30 +149,69 @@ cp_get_netaddr() {
   CP_ECHO_RETURN="$echo_return"
 }
 
-# by ico, Tue, 15 Mar 2005 14:04:21 +0100
-cp_backup_conffile() {
-  cp_check_and_backup "$@"
+cp_check_and_backup() {
+  [ "$CP_SCRIPT_DEBUG" ] && set -vx
+
+  cp_backup_conffile -r "$@"
 }
 
-cp_check_and_backup() {
+# by ico, Tue, 15 Mar 2005 14:04:21 +0100
+cp_backup_conffile() {
   [ "$CP_SCRIPT_DEBUG" ] && set -vx
-  local file_bak check did
+
+  local dir ext file_bak check did opt_p opt_d
   
-  if [ "x$1" = "x-r" ]; then
-    check=1
-    shift
+  dir=/var/backups
+  ext=.bak
+  
+  while echo "x$1" |grep -q '^x-'; do
+    case "$1" in
+    -r)
+      shift
+      check=1
+      ;;
+    -p)
+      shift
+      opt_p=1
+    -d)
+      shift
+      opt_d=1
+      # Is argument to -d full path or relative?
+      if echo "$1" |grep -q '^/'; then
+        dir="$1"
+      else
+        dir="$dir/$1"
+      fi
+      shift
+      ;;
+    -n)
+      shift
+      ext=
+    esac
+  done
+  if [ "$opt_d" ]; then
+    if [ ! -e "$dir" -a "$opt_p" ]; then
+      mkdir "$dir"
+    if [ $? -ne 0 ]; then
+      echo "cp_backup_conffile: Error creating backup directory $dir" 1>&2
+      return 3
+    fi
+  fi
+  if [ ! -d "$dir" ]; then
+    echo "cp_backup_conffile: Invalid backup directory $dir" 1>&2
+    return 3
   fi
   if [ -z "$1" ]; then
     return 1
   fi
   if [ ! -f "$1" ]; then
     echo "cp_backup_conffile: $1: No such file" 1>&2
-    return 1
+    return 2
   fi
   if [ -z "$2" ]; then
-    file_bak="/var/backups/`basename $1`.bak"
+    file_bak="$dir/`basename $1`$ext"
   else
-    file_bak="/var/backups/`basename $2`.bak"
+    file_bak="$dir/`basename $2`$ext"
   fi
 
   if [ ! -f "$file_bak" ]; then
@@ -173,15 +224,18 @@ cp_check_and_backup() {
       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
 }
 
 # by jelly, Tue, 15 Mar 2005 14:04:21 +0100
+# modified by ico, Mon,  6 Jun 2005 11:58:08 +0200
 # A sed wrapper, to use instead of perl -pi -e
 #  - relatively safe in-place s///g
 #  - takes care of symlinks and ownership
@@ -189,7 +243,11 @@ cp_check_and_backup() {
 #
 cp_check_and_sed() {
   [ "$CP_SCRIPT_DEBUG" ] && set -vx
-  local s sedcmd ret i
+
+  local s sedcmd grepret ret i
+  if [ -z "$3" ]; then
+    return 1
+  fi
   s="$1"
   shift
   sedcmd="$1"
@@ -198,9 +256,17 @@ cp_check_and_sed() {
   for i in "$@"
   do
     [ -e "$i" ]        || continue
-    egrep -q "$s" "$i" || continue
+    if ! egrep -q "$s" "$i"; then
+      grepret=1
+      continue
+    fi
     [ -h "$i" ]        && i=$(readlink -f "$i")
     sed "$sedcmd" "$i" > "$i.dpkg-tmp"
+    if [ $? -ne 0 ]; then
+      rm "$i.dpkg-tmp"
+      echo "cp_check_and_sed: Problem with sed" 1>&2
+      return 5
+    fi
     if ! cmp -s "$i" "$i.dpkg-tmp" 2>&1 >/dev/null; then
       cp_mv "$i.dpkg-tmp" "$i"
     else
@@ -208,12 +274,14 @@ cp_check_and_sed() {
     fi
     ret=0
   done
+  [ "$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   
@@ -229,13 +297,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>
@@ -260,6 +333,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
@@ -272,6 +346,7 @@ cp_mv () {
   fi
   mv "$new" "$old"
 }
+
 # by ddzeko, Mon, 21 Mar 2005 13:35:42 +0100
 cp_yes_no () {
   [ "$CP_SCRIPT_DEBUG" ] && set -vx
@@ -315,6 +390,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"
   
@@ -339,17 +416,17 @@ 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 1
+    return 2
   fi
   
   RET="`awk  '/^suffix/      { exit }
@@ -369,17 +446,17 @@ 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 1
+    return 2
   fi
  
   cp_get_ldap_suffix || true
@@ -389,3 +466,4 @@ cp_get_ldap_realm() {
   [ -z "$echo_return" ] || echo $RET
   CP_ECHO_RETURN="$echo_return"
 }
+