projects
/
carnet-tools-cn.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
r12:
[carnet-tools-cn.git]
/
functions.sh
diff --git
a/functions.sh
b/functions.sh
index
6e01cfd
..
13429de
100644
(file)
--- a/
functions.sh
+++ b/
functions.sh
@@
-4,7
+4,11
@@
cp_get_ifaddr() {
local ifaddr interface
interface="$1"
local ifaddr interface
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
echo "cp_get_ifaddr: $interface: No such interface" 1>&2
if ! ifconfig $interface 2> /dev/null >> /dev/null; then
echo "cp_get_ifaddr: $interface: No such interface" 1>&2
@@
-28,7
+32,11
@@
cp_get_ifmask() {
local ifmask interface
interface="$1"
local ifmask interface
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
echo "cp_get_ifmask: $interface: No such interface" 1>&2
if ! ifconfig $interface 2> /dev/null >> /dev/null; then
echo "cp_get_ifmask: $interface: No such interface" 1>&2
@@
-114,11
+122,11
@@
cp_backup_conffile() {
[ "$CP_SCRIPT_DEBUG" ] && set -vx
local file_bak
[ "$CP_SCRIPT_DEBUG" ] && set -vx
local file_bak
- if [ -z $1 ]; then
+ if [ -z "$1" ]; then
echo "Usage: cp_backup_conffile <file>" 1>&2
return 1
fi
echo "Usage: cp_backup_conffile <file>" 1>&2
return 1
fi
- if [ ! -f $1 ]; then
+ if [ ! -f "$1" ]; then
echo "cp_backup_conffile: $1: No such file" 1>&2
return 1
fi
echo "cp_backup_conffile: $1: No such file" 1>&2
return 1
fi
@@
-126,9
+134,9
@@
cp_backup_conffile() {
file_bak="/var/backups/`basename $1`.bak"
if [ ! -f $file_bak ]; then
file_bak="/var/backups/`basename $1`.bak"
if [ ! -f $file_bak ]; then
- cp -pf $1 $file_bak
+ cp -pf "$1" $file_bak
else
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
/usr/bin/savelog -p -c 7 $file_bak > /dev/null 2> /dev/null
cp -pf $1 $file_bak
fi