plus set -vx ako postoji CP_SCRIPT_DEBUG u svim funkcijama...
+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 <irako@srce.hr> 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
carnet-tools-cn (2.4.1) sarge; urgency=low
* cp_backup_conffile je greskom vracao false ako backup nije
# 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
# 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
# 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
}
cp_check_and_backup() {
}
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
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
local file_bak check did
if [ "x$1" = "x-r" ]; then
#
cp_check_and_sed() {
[ "$CP_SCRIPT_DEBUG" ] && set -vx
#
cp_check_and_sed() {
[ "$CP_SCRIPT_DEBUG" ] && set -vx
local s sedcmd grepret ret i
if [ -z "$3" ]; then
return 1
local s sedcmd grepret ret i
if [ -z "$3" ]; then
return 1
# by jelly, Sun, 20 Mar 2005 20:12:19 +0100
cp_echo () {
[ "$CP_SCRIPT_DEBUG" ] && set -vx
# 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
# 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
# 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
# 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
+
# 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
# 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