+# 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
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
# 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
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
# 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
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
CP_ECHO_RETURN="$echo_return"
}
+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
+ local file_bak check did
+
+ if [ "x$1" = "x-r" ]; then
+ check=1
+ shift
+ 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"
+ else
+ file_bak="/var/backups/`basename $2`.bak"
fi
- file_bak="/var/backups/`basename $1`.bak"
-
- if [ ! -f $file_bak ]; then
- cp -pf "$1" $file_bak
+ if [ ! -f "$file_bak" ]; then
+ cp -pf "$1" "$file_bak"
+ did=1
else
- if ! cmp -s "$1" $file_bak; then
- /usr/bin/savelog -p -c 7 $file_bak > /dev/null 2> /dev/null
- cp -pf $1 $file_bak
+ if ! cmp -s "$1" "$file_bak"; then
+ /usr/bin/savelog -p -c 7 "$file_bak" > /dev/null 2> /dev/null
+ cp -pf "$1" "$file_bak"
+ did=1
fi
fi
+
+ [ -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
#
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"
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
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
# 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>
# 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
fi
mv "$new" "$old"
}
+
# by ddzeko, Mon, 21 Mar 2005 13:35:42 +0100
cp_yes_no () {
[ "$CP_SCRIPT_DEBUG" ] && set -vx
# instead of some gibberish error message that our script does
# not expect
cp_db_get() {
+ [ "$CP_SCRIPT_DEBUG" ] && set -vx
+
local var
var="$1"
# 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/'{print $2}' /etc/ldap/slapd.conf | head -1 | tr -d '"'`"
-
+ RET="`awk '/^suffix/ { exit }
+ END { gsub(/"/, "", $2); print $2 }' \
+ < /etc/ldap/slapd.conf`"
+
+ if [ "`echo $RET | sed 's/,/ /g' | wc -w`" -gt 2 ]; then
+ RET=""
+ echo "cp_get_ldap_suffix: Invalid LDAP suffix in /etc/ldap/slapd.conf" >&2
+ return 2
+ fi
+
[ -z "$RET" ] && echo "cp_get_ldap_suffix: No LDAP suffix in /etc/ldap/slapd.conf" >&2
[ -z "$echo_return" ] || echo $RET
CP_ECHO_RETURN="$echo_return"
# 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
-
- RET="`awk /^suffix/'{print $2}' /etc/ldap/slapd.conf | head -1 | tr -d '"' | awk -F, '{print $1}' | awk -F= '{print $2}'`"
+
+ cp_get_ldap_suffix || true
+ RET="`echo $RET | awk -F, '{print $1}' | awk -F= '{print $2}'`"
- [ -z "$RET" ] && echo "cp_get_ldap_suffix: No LDAP REALM in /etc/ldap/slapd.conf" >&2
+ [ -z "$RET" ] && echo "cp_get_ldap_realm: No LDAP REALM in /etc/ldap/slapd.conf" >&2
[ -z "$echo_return" ] || echo $RET
CP_ECHO_RETURN="$echo_return"
}
+
projects / carnet-tools-cn.git / blobdiff