r102:

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

diff --git a/functions.sh b/functions.sh
index cd0bdee..2ab04ff 100644 (file)
--- a/functions.sh
+++ b/functions.sh
@@ -1,3 +1,9 @@
+# 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
@@ -82,9 +88,19 @@ cp_get_ifdefault() {
 
   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 ;;
+    dev)
+      RET=`route -n | awk 'BEGIN {m = 2^32}
+                           /^0\.0\.0\.0[ \t]/ {if ($5 < m) {r = $8; m = $5}}
+                             END {print r}'`
+      ;;
+    addr)
+      RET=`route -n | awk 'BEGIN {m = 2^32}
+                           /^0\.0\.0\.0[ \t]/ {if ($5 < m) {r = $2; m = $5}}
+                                    END {print r}'`
+      ;;
+    *)
+      echo "cp_get_ifdefault: Argument required (dev or addr)" >&2
+      ;;
   esac
 
   [ -z "$RET" -a "$1" ] && echo "cp_get_ifdefault: No default route" >&2
@@ -153,11 +169,50 @@ cp_check_and_backup() {
 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"
+    fi
+    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
@@ -167,9 +222,9 @@ cp_backup_conffile() {
     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
@@ -232,7 +287,7 @@ 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
 }
 
@@ -261,8 +316,12 @@ cp_mail () {
     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>
@@ -421,3 +480,41 @@ cp_get_ldap_realm() {
   CP_ECHO_RETURN="$echo_return"
 }
 
+_cp_customize() {
+  [ "$CP_SCRIPT_DEBUG" ] && set -vx
+  # < input functions > output_functions
+  # new-prefix list-of-functions
+  perl -e '
+    $prefix = shift; %keep = (); $output = "";
+    $keep{$_} = 1 for @ARGV;
+    # add dependent functions
+    %deps = (
+      get_ifaddr       => [ "get_ifdefault" ],
+      get_netaddr      => [ "get_ifdefault", "get_ifaddr", "get_ifmask" ],
+      check_and_backup => [ "backup_conffile" ],
+      check_and_sed    => [ "mv" ],
+      get_ldap_realm   => [ "get_ldap_suffix" ],
+    );
+    foreach my $f (keys(%keep)) {
+      if (exists($deps{$f})) {
+        $keep{$_} = 1 for (@{$deps{$f}});
+      }
+    }
+    while (<STDIN>) {
+      if (/^_?cp_(\w+) *\(\) *\{/) {
+        if (! exists($keep{$1})) {
+          while (<STDIN>) { last if /^\}/; } # skip it
+          next;
+        } else {
+          $output .= "\n";
+        }
+      }
+      next if /^\s*(\#|$)/;
+      $output .= $_;
+    }
+    $output =~ s/\b(_?)cp_/$1${prefix}_/sg;
+    $prefix = uc($prefix);
+    $output =~ s/\b(_?)CP_/$1${prefix}_/sg;
+    print $output;
+  ' -- $*
+}