# by ddzeko & ico, Fri, 18 Mar 2005 14:44:08 +0100
cp_get_ifaddr() {
[ "$CP_SCRIPT_DEBUG" ] && set -vx
- local ifaddr interface
+ 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
+ # but preserving initial state so it could be used afterwards
+ CP_ECHO_RETURN=""
interface="$1"
- [ -z "$interface" ] && interface=lo
+ if [ -z "$interface" ]; then
+ cp_get_ifdefault dev
+ interface="$RET"
+ [ -z "$interface" ] && interface=lo
+ fi
if ! ifconfig $interface 2> /dev/null >> /dev/null; then
- [ -z "$CP_ECHO_RETURN" ] || echo "cp_get_ifaddr: $interface: No such interface"
+ echo "cp_get_ifaddr: $interface: No such interface" 1>&2
+ CP_ECHO_RETURN="$echo_return"
return 1
fi
ifaddr="`/sbin/ifconfig $interface | awk '/inet/{ printf("%s\n",substr($2,index($2,":")+1)) }'`"
if [ -z $ifaddr ]; then
- [ -z "$CP_ECHO_RETURN" ] || echo "cp_get_ifaddr: $interface: No such ipaddress"
+ echo "cp_get_ifaddr: $interface: No such ipaddress" 1>&2
+ CP_ECHO_RETURN="$echo_return"
return 1
fi
RET="$ifaddr"
- [ -z "$CP_ECHO_RETURN" ] || echo $RET
+ [ -z "$echo_return" ] || echo $RET
+ CP_ECHO_RETURN="$echo_return"
}
# by ddzeko & ico, Fri, 18 Mar 2005 14:44:08 +0100
cp_get_ifmask() {
[ "$CP_SCRIPT_DEBUG" ] && set -vx
- local ifmask interface
+ 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
+ # but preserving initial state so it could be used afterwards
+ CP_ECHO_RETURN=""
interface="$1"
- [ -z "$interface" ] && interface=lo
+ if [ -z "$interface" ]; then
+ cp_get_ifdefault dev
+ interface="$RET"
+ [ -z "$interface" ] && interface=lo
+ fi
if ! ifconfig $interface 2> /dev/null >> /dev/null; then
- [ -z "$CP_ECHO_RETURN" ] || echo "cp_get_ifmask: $interface: No such interface"
+ echo "cp_get_ifmask: $interface: No such interface" 1>&2
+ CP_ECHO_RETURN="$echo_return"
return 1
fi
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
- [ -z "$CP_ECHO_RETURN" ] || echo "cp_get_ifmask: $interface: No such netmask"
+ echo "cp_get_ifmask: $interface: No such netmask" 1>&2
+ CP_ECHO_RETURN="$echo_return"
return 1
fi
RET="$ifmask"
- [ -z "$CP_ECHO_RETURN" ] || echo $RET
+ [ -z "$echo_return" ] || echo $RET
+ CP_ECHO_RETURN="$echo_return"
}
# by ddzeko, Mon, 21 Mar 2005 07:00:22 +0100
cp_get_ifdefault() {
+ 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
*) echo "cp_get_ifdefault: Argument required (dev or addr)" >&2 ;;
esac
[ -z "$RET" -a "$1" -a "$CP_VERBOSE" ] && echo "cp_get_ifdefault: No default route" >&2
- [ -z "$CP_ECHO_RETURN" ] || echo $RET
+ [ -z "$echo_return" ] || echo $RET
+ CP_ECHO_RETURN="$echo_return"
[ -z "$RET" ] && return 1
}
fi
if ! ifconfig $interface 2> /dev/null >> /dev/null; then
- [ "$CP_VERBOSE" ] || echo "cp_get_netaddr: $interface: No such interface"
- goto return1
+ echo "cp_get_netaddr: $interface: No such interface" 1>&2
+ CP_ECHO_RETURN="$echo_return"
+ return 1
fi
cp_get_ifaddr "$interface"
ipaddress="$RET"
if [ -z $ipaddress ]; then
- [ "$CP_VERBOSE" ] || echo "cp_get_netaddr: $interface: No such ipaddress"
- goto return1
+ echo "cp_get_netaddr: $interface: No such ipaddress" 1>&2
+ CP_ECHO_RETURN="$echo_return"
+ return 1
fi
cp_get_ifmask "$interface"
netmask="$RET"
if [ -z $netmask ]; then
- [ "$CP_VERBOSE" ] || echo "cp_get_netaddr: $interface: No such netmask"
+ echo "cp_get_netaddr: $interface: No such netmask" 1>&2
+ CP_ECHO_RETURN="$echo_return"
+ return 1
fi
if [ "$netmask" = "255.255.255.255" ]; then
RET="$cidr"
[ -z "$echo_return" ] || echo $RET
CP_ECHO_RETURN="$echo_return"
- return 0
-
- return1:
- CP_ECHO_RETURN="$echo_return"
- return 1
}
# by ico, Tue, 15 Mar 2005 14:04:21 +0100
[ "$CP_SCRIPT_DEBUG" ] && set -vx
local file_bak
- if [ -z $1 ]; then
- [ -z "$CP_ECHO_RETURN" ] || echo "Usage: cp_backup_conffile <file>"
+ if [ -z "$1" ]; then
return 1
fi
- if [ ! -f $1 ]; then
- [ -z "$CP_ECHO_RETURN" ] || echo "cp_backup_conffile: $1: No such file"
+ if [ ! -f "$1" ]; then
+ echo "cp_backup_conffile: $1: No such file" 1>&2
return 1
fi
file_bak="/var/backups/`basename $1`.bak"
if [ ! -f $file_bak ]; then
- cp -pf $1 $file_bak
+ cp -pf "$1" $file_bak
else
- if ! cmp -s $1 $file_bak; then
+ 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
fi
egrep -q "$s" "$i" || continue
[ -h "$i" ] && i=$(readlink -f "$i")
sed "$sedcmd" "$i" > "$i.dpkg-tmp"
- if ! cmp -s "$i" "$i.dpkg-tmp"; then
- chown --reference "$i" "$i.dpkg-tmp"
- chmod --reference "$i" "$i.dpkg-tmp"
- mv "$i.dpkg-tmp" "$i"
+ if ! cmp -s "$i" "$i.dpkg-tmp" 2>&1 >/dev/null; then
+ cp_safe_file_replace "$i.dpkg-tmp" "$i"
else
rm "$i.dpkg-tmp"
fi
sleep 1
fi
}
+
+# 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
+ new="$1"
+ old="$2"
+ if [ -e "$old" ]; then
+ chown --reference "$old" "$new"
+ chmod --reference "$old" "$new"
+ fi
+ mv "$new" "$old"
+}