fixed handling of * in easydialog.

added .disabled
This commit is contained in:
Elijah Saxon 2005-07-06 08:03:31 +00:00
parent d87e87882f
commit e8cf41e99e
5 changed files with 29 additions and 28 deletions

View File

@ -476,7 +476,7 @@ for file in $files; do
check_perms $file
suffix="${file##*.}"
base=`basename $file`
if [ "${base:0:1}" == "0" ]; then
if [ "${base:0:1}" == "0" -o "$suffix" == "disabled" ]; then
info "Skipping $file"
continue
fi

View File

@ -1,7 +1,8 @@
version 0.7 -- July 3 2005
added ninjahelper: a dialog based wizard for creating backupninja configs.
considerably improved and changed the log file output.
you can now disable actions with .disabled (this is new preferred method).
version 0.6 -- June 16 2005
ldap handler has new options: backup method to use (ldapsearch or
slapcat), restart, passwordfile and binddn. Default backup method

View File

@ -164,19 +164,20 @@ displayForm() {
local form=
local xpos=1
for ((i=0; i < $_form_items ; i++)); do
label=${_form_labels[$i]}
text=${_form_text[$i]}
if [ "$text" == "" ]; then
text='_empty_'
fi
form=`echo -e "$form $label $xpos 1" $text "$xpos $max_length 30 30"`
let "xpos += _form_gap"
done
$DIALOG --form "$_form_title" 0 0 20 $form 2> $temp
(
echo -n -e "--form '$_form_title' 0 0 20"
for ((i=0; i < $_form_items ; i++)); do
label=${_form_labels[$i]}
text=${_form_text[$i]}
if [ "$text" == "" ]; then
text='_empty_'
fi
echo -n -e "$form $label $xpos 1 '$text' $xpos $max_length 30 30"
let "xpos += _form_gap"
done
) | xargs $DIALOG 2> $temp
local status=$?
[ $status = 0 ] && REPLY=$(cat $temp)
[ $status = 0 ] && REPLY=`cat $temp`
rm -f $temp
return $status
}

View File

@ -22,22 +22,23 @@ rdiff_wizard() {
formItem include /etc
formItem include /root
formItem include /home
formItem include /usr/local/__star__bin
formItem include /var/lib/dpkg/status__star__
formItem include '/usr/local/*bin'
formItem include '/var/lib/dpkg/status*'
formItem include
formItem include
formItem include
displayForm
[ $? = 1 ] && return;
includes=
set -o noglob
for i in $REPLY; do
[ "$i" != "_empty_" ] && includes="$includes\ninclude = $i"
done
set +o noglob
startForm "rdiff action wizard: excludes"
formItem exclude /home/__star__/.gnupg
formItem exclude '/home/*/.gnupg'
formItem exclude
formItem exclude
displayForm
@ -45,18 +46,20 @@ rdiff_wizard() {
[ $? = 1 ] && return;
excludes=
set -o noglob
for i in $REPLY; do
[ "$i" != "_empty_" ] && excludes="$excludes\nexclude = $i"
done
set +o noglob
get_next_filename $configdirectory/90.rdiff
cat > $next_filename <<EOF
[source]
type = local
keep = $keep
EOF
echo -e $includes >> $next_filename
echo -e $excludes >> $next_filename
echo -e "$includes" >> $next_filename
echo -e "$excludes" >> $next_filename
cat >> $next_filename <<EOF
[dest]

View File

@ -90,15 +90,11 @@ do_run_test() {
}
do_disable() {
dir=`dirname $1`
base=`basename $1`
mv $dir/$base $dir/0-$base
mv $1 $1.disabled
}
do_enable() {
dir=`dirname $1`
base=`basename $1`
mv $dir/$base $dir/${base:2}
mv $1 ${1%.*}
}
do_rename() {
@ -111,7 +107,7 @@ do_rename() {
doaction() {
action=$1
base=`basename $action`
if [ "${base:0:2}" == "0-" ]; then
if [ "${base##*.}" == "disabled" ]; then
enable="enable";
else
enable="disable";