From ea01a241287a74a8a5b3576f6fdda3c801786cb7 Mon Sep 17 00:00:00 2001 From: Ivan Rako Date: Tue, 23 Aug 2005 13:19:17 +0000 Subject: [PATCH] r74: kriva logika na kraju cp_get_ifdefault... plus set -vx ako postoji CP_SCRIPT_DEBUG u svim funkcijama... --- changelog.CARNet | 8 ++++++++ functions.sh | 27 +++++++++++++++++++++------ 2 files changed, 29 insertions(+), 6 deletions(-) diff --git a/changelog.CARNet b/changelog.CARNet index 5a86208..47de907 100644 --- a/changelog.CARNet +++ b/changelog.CARNet @@ -1,3 +1,11 @@ +carnet-tools-cn (2.4.2) sarge; urgency=low + + * dodan set -vx u sve funkcije, ako postoji varijabla CP_SCRIPT_DEBUG + * sredjen problem sa cp_get_ifdefault() (uvijek se vracao false, zbog + krive logike na kraju funkcije) + + -- Ivan 'ico' Rako Tue, 23 Aug 2005 15:08:45 +0200 + carnet-tools-cn (2.4.1) sarge; urgency=low * cp_backup_conffile je greskom vracao false ako backup nije diff --git a/functions.sh b/functions.sh index 28877c5..cd0bdee 100644 --- 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 + 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 + 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() { + [ "$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 @@ -138,12 +144,15 @@ cp_get_netaddr() { } 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 check did if [ "x$1" = "x-r" ]; then @@ -192,6 +201,7 @@ cp_backup_conffile() { # cp_check_and_sed() { [ "$CP_SCRIPT_DEBUG" ] && set -vx + local s sedcmd grepret ret i if [ -z "$3" ]; then return 1 @@ -229,6 +239,7 @@ cp_check_and_sed() { # 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 @@ -244,6 +255,7 @@ 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 @@ -275,6 +287,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 @@ -331,6 +344,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" @@ -355,14 +370,14 @@ 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 2 @@ -385,14 +400,14 @@ 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 2 -- 1.7.10.4