projects
/
matthijs
/
upstream
/
backupninja.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (from parent 1:
3390478
)
added --run, fix to __star__
author
Elijah Saxon
<elijah@riseup.net>
Thu, 10 Mar 2005 11:28:23 +0000
(11:28 +0000)
committer
Elijah Saxon
<elijah@riseup.net>
Thu, 10 Mar 2005 11:28:23 +0000
(11:28 +0000)
backupninja
patch
|
blob
|
history
diff --git
a/backupninja
b/backupninja
index 81b1a17896412ef8eb5e8943291885b5e9ba0907..fb625245b293cd0ab606237c2608ab2d01ac4184 100755
(executable)
--- a/
backupninja
+++ b/
backupninja
@@
-31,7
+31,7
@@
function setupcolors() {
}
function colorize() {
}
function colorize() {
- if [ "$usecolor" == "yes" ]; then
+ if [ "$usecolor
s
" == "yes" ]; then
local typestr=`echo "$@" | sed 's/\(^[^:]*\).*$/\1/'`
[ "$typestr" == "Debug" ] && type=0
[ "$typestr" == "Info" ] && type=1
local typestr=`echo "$@" | sed 's/\(^[^:]*\).*$/\1/'`
[ "$typestr" == "Debug" ] && type=0
[ "$typestr" == "Info" ] && type=1
@@
-58,7
+58,7
@@
function colorize() {
# used to capture output from handlers
echo_debug_msg=0
# used to capture output from handlers
echo_debug_msg=0
-usecolor=yes
+usecolor
s
=yes
function printmsg() {
[ ${#@} -gt 1 ] || return
function printmsg() {
[ ${#@} -gt 1 ] || return
@@
-143,6
+143,7
@@
function getconf() {
# replace * with %, so that it is not globbed.
ret="${ret//\\*/__star__}"
# replace * with %, so that it is not globbed.
ret="${ret//\\*/__star__}"
+ ret="${ret//\*/__star__}"
# this is weird, but single quotes are needed to
# allow for returned values with spaces. $ret is still expanded
# this is weird, but single quotes are needed to
# allow for returned values with spaces. $ret is still expanded
@@
-238,6
+239,7
@@
The following options are available:
-t, --test Run in test mode, no actions are actually taken.
-n, --now Perform actions now, instead of when they
might be scheduled.
-t, --test Run in test mode, no actions are actually taken.
-n, --now Perform actions now, instead of when they
might be scheduled.
+ --run FILE Execute the specified action file and then exit.
When using colored output, there are:
EOF
debug=1
When using colored output, there are:
EOF
debug=1
@@
-352,11
+354,11
@@
while [ $# -ge 1 ]; do
# we shift here to avoid processing the file path
shift
;;
# we shift here to avoid processing the file path
shift
;;
- --run)
+ --run)
+ debug=1
if [ -f $2 ]; then
singlerun=$2
processnow=1
if [ -f $2 ]; then
singlerun=$2
processnow=1
- debug=1
else
fatal "--run option must be fallowed by a backupninja action file"
usage
else
fatal "--run option must be fallowed by a backupninja action file"
usage
@@
-364,13
+366,19
@@
while [ $# -ge 1 ]; do
shift
;;
*)
shift
;;
*)
+ debug=1
fatal "Unknown option $1"
usage
fatal "Unknown option $1"
usage
+ exit
;;
esac
shift
done
;;
esac
shift
done
+#if [ $debug ]; then
+# usercolors=yes
+#fi
+
## Load and confirm basic configuration values
# bootstrap
## Load and confirm basic configuration values
# bootstrap
@@
-420,11
+428,11
@@
errormsg=""
if [ "$singlerun" ]; then
files=$singlerun
else
if [ "$singlerun" ]; then
files=$singlerun
else
- files=`
ls $configdirectory
`
+ files=`
find $configdirectory -mindepth 1
`
fi
for file in $files; do
fi
for file in $files; do
- [ -f
$file ] || continue;
+ [ -f
"$file" ] || continue
check_perms $file
suffix="${file##*.}"
check_perms $file
suffix="${file##*.}"
@@
-441,7
+449,7
@@
for file in $files; do
msg "*missing handler* -- $file"
fi
done
msg "*missing handler* -- $file"
fi
done
-
+
## mail the messages to the report address
if [ $actions_run == 0 ]; then doit=0
## mail the messages to the report address
if [ $actions_run == 0 ]; then doit=0