projects
/
carnet-tools-cn.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
r74: kriva logika na kraju cp_get_ifdefault...
[carnet-tools-cn.git]
/
functions.sh
diff --git
a/functions.sh
b/functions.sh
index
19116f8
..
cd0bdee
100644
(file)
--- a/
functions.sh
+++ b/
functions.sh
@@
-1,6
+1,7
@@
# by ddzeko & ico, Fri, 18 Mar 2005 14:44:08 +0100
cp_get_ifaddr() {
[ "$CP_SCRIPT_DEBUG" ] && set -vx
# 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
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
+37,7
@@
cp_get_ifaddr() {
# by ddzeko & ico, Fri, 18 Mar 2005 14:44:08 +0100
cp_get_ifmask() {
[ "$CP_SCRIPT_DEBUG" ] && set -vx
# 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
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
+72,32
@@
cp_get_ifmask() {
# by ddzeko, Mon, 21 Mar 2005 07:00:22 +0100
cp_get_ifdefault() {
# 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=""
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
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 "$RET" -a "$1" ] && echo "cp_get_ifdefault: No default route" >&2
+
[ -z "$echo_return" ] || echo $RET
CP_ECHO_RETURN="$echo_return"
[ -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
}
# 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
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
@@
-137,13
+143,16
@@
cp_get_netaddr() {
CP_ECHO_RETURN="$echo_return"
}
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
[ "$CP_SCRIPT_DEBUG" ] && set -vx
+
local file_bak check did
if [ "x$1" = "x-r" ]; then
local file_bak check did
if [ "x$1" = "x-r" ]; then
@@
-173,15
+182,18
@@
cp_check_and_backup() {
did=1
fi
fi
did=1
fi
fi
-
- if [ "$check" -a "$did" ]; then
- return 0
- else
+
+ [ -z "$check" ] && return 0
+
+ if [ "$check" -a ! "$did" ]; then
return 3
return 3
+ else
+ return 0
fi
}
# by jelly, Tue, 15 Mar 2005 14:04:21 +0100
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
# A sed wrapper, to use instead of perl -pi -e
# - relatively safe in-place s///g
# - takes care of symlinks and ownership
@@
-189,7
+201,11
@@
cp_check_and_backup() {
#
cp_check_and_sed() {
[ "$CP_SCRIPT_DEBUG" ] && set -vx
#
cp_check_and_sed() {
[ "$CP_SCRIPT_DEBUG" ] && set -vx
+
local s sedcmd grepret ret i
local s sedcmd grepret ret i
+ if [ -z "$3" ]; then
+ return 1
+ fi
s="$1"
shift
sedcmd="$1"
s="$1"
shift
sedcmd="$1"
@@
-204,6
+220,11
@@
cp_check_and_sed() {
fi
[ -h "$i" ] && i=$(readlink -f "$i")
sed "$sedcmd" "$i" > "$i.dpkg-tmp"
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
if ! cmp -s "$i" "$i.dpkg-tmp" 2>&1 >/dev/null; then
cp_mv "$i.dpkg-tmp" "$i"
else
@@
-211,13
+232,14
@@
cp_check_and_sed() {
fi
ret=0
done
fi
ret=0
done
- [ "$ret" -eq 2 -a "$grepret"] && ret=1 || true
+ [ "$ret" -eq 2 -a "$grepret" ] && ret=1 || true
return $ret
}
# by jelly, Sun, 20 Mar 2005 20:12:19 +0100
cp_echo () {
[ "$CP_SCRIPT_DEBUG" ] && set -vx
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
if [ "x$1" = "x-mailonly" -o "x$1" = "x-m" ]; then
shift
else
@@
-233,6
+255,7
@@
cp_echo () {
# by jelly, Sun, 20 Mar 2005 20:12:19 +0100
cp_mail () {
[ "$CP_SCRIPT_DEBUG" ] && set -vx
# 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
local pkg version quiet
if [ "x$1" = "x-q" ]; then
quiet=1
@@
-264,6
+287,7
@@
${CP_NOTICE}----------"
# by ddzeko, Mon, 21 Mar 2005 11:31:59 +0100
cp_mv () {
[ "$CP_SCRIPT_DEBUG" ] && set -vx
# 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
local new old
if [ -z "$2" ]; then
return 1
@@
-276,6
+300,7
@@
cp_mv () {
fi
mv "$new" "$old"
}
fi
mv "$new" "$old"
}
+
# by ddzeko, Mon, 21 Mar 2005 13:35:42 +0100
cp_yes_no () {
[ "$CP_SCRIPT_DEBUG" ] && set -vx
# by ddzeko, Mon, 21 Mar 2005 13:35:42 +0100
cp_yes_no () {
[ "$CP_SCRIPT_DEBUG" ] && set -vx
@@
-319,6
+344,8
@@
cp_yes_no () {
# instead of some gibberish error message that our script does
# not expect
cp_db_get() {
# instead of some gibberish error message that our script does
# not expect
cp_db_get() {
+ [ "$CP_SCRIPT_DEBUG" ] && set -vx
+
local var
var="$1"
local var
var="$1"
@@
-343,14
+370,14
@@
cp_db_get() {
# by ico, Wed, 20 Apr 2005 21:09:54 +0200
cp_get_ldap_suffix() {
# 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=""
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
if [ ! -f /etc/ldap/slapd.conf ]; then
echo "cp_get_ldap_suffix: /etc/ldap/slapd.conf: No such file" >&2
return 2
@@
-373,14
+400,14
@@
cp_get_ldap_suffix() {
# by ico, Wed, 20 Apr 2005 21:09:54 +0200
cp_get_ldap_realm() {
# 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=""
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
if [ ! -f /etc/ldap/slapd.conf ]; then
echo "cp_get_ldap_realm: /etc/ldap/slapd.conf: No such file" >&2
return 2
@@
-393,3
+420,4
@@
cp_get_ldap_realm() {
[ -z "$echo_return" ] || echo $RET
CP_ECHO_RETURN="$echo_return"
}
[ -z "$echo_return" ] || echo $RET
CP_ECHO_RETURN="$echo_return"
}
+