Masato Taruishi
taru****@users*****
2004年 9月 17日 (金) 20:26:24 JST
===================================================================
RCS file: ultrapossum/ultrapossum-config.in,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -r1.18 -r1.19
--- ultrapossum/ultrapossum-config.in 2004/09/17 10:55:57 1.18
+++ ultrapossum/ultrapossum-config.in 2004/09/17 11:26:24 1.19
@@ -40,28 +40,6 @@
. $SHAREDIR/init.d/10config
shift
getvariable "$@"
-# shift
-# if test "x$1" = "x"; then
-# modules=`ultrapossum-config module`
-# else
-# modules="$@"
-# fi
-# for m in $modules
-# do
-# if test -f "$MODULEDIR/$m/variable-$m"; then
-# cat "$MODULEDIR/$m/variable-$m"
-# else
-# if test -d "$MODULEDIR/$m/"; then
-# /bin/ls $MODULEDIR/[0-9][0-9]$m | while read f; do
-# egrep "[A-Z_][A-Z_]*=" $f | cut -d= -f1 | grep -v IFS | tr -d ' ' | sort | uniq
-# done
-# else
-# echo "E: No such module: $m" 1>&2
-# exit 1
-# fi
-# fi
-# done
-# if test "x$1" = "x"; then cat $SHAREDIR/variable; fi
;;
xget)
shift
@@ -75,28 +53,13 @@
echo "Usage: $0 remove <category> <var>..."
exit 1
fi
- eval `ultrapossum-config init`
- trap "eval `ultrapossum-config term`" 0
- if test "x$1" = "x."; then
- config=$SYSCONFDIR/ultrapossum.cf
- elif test "x$1" = "xsecret"; then
- config=$SYSCONFDIR/secret.cf
- elif test "x$1" = "x.status"; then
- config=$localstatedir/lib/$PACKAGE/status
- else
- config=$SYSCONFDIR/module.d/$1.cf
- fi
- if test -f "$config"; then
- tmp=`tempfile`
- /bin/cp -p $config $tmp
- shift
- for v in "$@"
- do
- egrep -v "^$v=" $config > $tmp || true
- /bin/cp -p $tmp $config
- done
- /bin/rm -f $tmp
- fi
+ cat=$1
+ shift
+ . $SHAREDIR/init.d/10config
+ for v in "$@"
+ do
+ ultrapossum_removeconf "$cat" "$v"
+ done
;;
xset)