forked from saratov/diag-domain-client
Added -f/--force option to force logging to existing file
This commit is contained in:
parent
4177ec1c81
commit
7ea1b20042
11
domain-diag
11
domain-diag
@ -12,6 +12,7 @@ verbose=
|
|||||||
listcmd=
|
listcmd=
|
||||||
runcmd=run
|
runcmd=run
|
||||||
logfile=/dev/null
|
logfile=/dev/null
|
||||||
|
force=
|
||||||
|
|
||||||
show_usage()
|
show_usage()
|
||||||
{
|
{
|
||||||
@ -26,6 +27,7 @@ show_usage()
|
|||||||
echo " -V, --version Display version number"
|
echo " -V, --version Display version number"
|
||||||
echo " -v, --verbose Verbose output"
|
echo " -v, --verbose Verbose output"
|
||||||
echo " -w, --logfile[=FILE] Write verbose output to file"
|
echo " -w, --logfile[=FILE] Write verbose output to file"
|
||||||
|
echo " -f, --force Force logging to existing file"
|
||||||
echo " -l, --list List of tests"
|
echo " -l, --list List of tests"
|
||||||
echo ""
|
echo ""
|
||||||
exit 0;
|
exit 0;
|
||||||
@ -37,7 +39,7 @@ print_version()
|
|||||||
exit 0;
|
exit 0;
|
||||||
}
|
}
|
||||||
|
|
||||||
TEMP=`getopt -n "$PROG" -o "v,V,w::,l,h" -l "verbose,version,logfile::,list,help" -- "$@"` || show_usage
|
TEMP=`getopt -n "$PROG" -o "v,V,w::,f,l,h" -l "verbose,version,logfile::,force,list,help" -- "$@"` || show_usage
|
||||||
eval set -- "$TEMP"
|
eval set -- "$TEMP"
|
||||||
|
|
||||||
while :; do
|
while :; do
|
||||||
@ -49,6 +51,8 @@ while :; do
|
|||||||
-w|--logfile) shift
|
-w|--logfile) shift
|
||||||
test -n "$1" && logfile="$1" || logfile=domain-diag.log
|
test -n "$1" && logfile="$1" || logfile=domain-diag.log
|
||||||
;;
|
;;
|
||||||
|
-f|--force) force=1
|
||||||
|
;;
|
||||||
-l|--list) listcmd=1
|
-l|--list) listcmd=1
|
||||||
;;
|
;;
|
||||||
-V|--version) print_version "$PROG"
|
-V|--version) print_version "$PROG"
|
||||||
@ -503,10 +507,13 @@ custom_run()
|
|||||||
init_log()
|
init_log()
|
||||||
{
|
{
|
||||||
local log_index
|
local log_index
|
||||||
if test -e "$logfile" && test "$logfile" != "/dev/null"; then
|
if test -e "$logfile" && test "$logfile" != "/dev/null" && test -z "$force"; then
|
||||||
log_index=$(ls $logfile.* 2>/dev/null | sort -V | tail -1 | sed -E 's/^.*\.([^.]*)$/\1/' || true)
|
log_index=$(ls $logfile.* 2>/dev/null | sort -V | tail -1 | sed -E 's/^.*\.([^.]*)$/\1/' || true)
|
||||||
logfile="$logfile".$(($log_index + 1))
|
logfile="$logfile".$(($log_index + 1))
|
||||||
fi
|
fi
|
||||||
|
if test "$logfile" != "/dev/null"; then
|
||||||
|
echo -n > "$logfile"
|
||||||
|
fi
|
||||||
}
|
}
|
||||||
|
|
||||||
init_vars()
|
init_vars()
|
||||||
|
Loading…
Reference in New Issue
Block a user