dpm.sh: Fix dpm.sh query

Signed-off-by: Jan Lindemann <jan@janware.com>
This commit is contained in:
Jan Lindemann 2015-06-01 07:18:26 +00:00
commit 149e7a52d3

View file

@ -59,10 +59,10 @@ cmd_query()
[ "$query_cmds" ] && { [ "$query_cmds" ] && {
local cmd installed local cmd installed
local id=name local id=name
if [ "`echo $query_cmds | sed 's/.*p.*//'`" ]; then if echo $query_cmds | grep -q p; then
id=pkg id=pkg
query_cmds=`echo $query_cmds | sed 's/p//'` query_cmds=`echo $query_cmds | sed 's/p//'`
elif [ "`echo $query_cmds | sed 's/.*f.*//'`" ]; then elif echo $query_cmds | grep -q f; then
id=file id=file
query_cmds=`echo $query_cmds | sed 's/f//'` query_cmds=`echo $query_cmds | sed 's/f//'`
fi fi
@ -81,6 +81,18 @@ cmd_query()
$dpkg -S $1;; $dpkg -S $1;;
esac esac
;; ;;
l)
case $id in
file)
echo blah
#$dpkg -p $1;;
;;
name)
$dpkg -L $1;;
pkg)
$dpkg -c $1;;
esac
;;
a) a)
$dpkg -L $1 $dpkg -L $1
;; ;;
@ -122,7 +134,7 @@ myname=`basename $0`
dpkg=log_dpkg dpkg=log_dpkg
cmd="" cmd=""
set -- `getopt hqiUeVfap "$@"` set -- `getopt hqiUeVfapl "$@"`
while [ "$1" != -- ]; do while [ "$1" != -- ]; do
case $1 in case $1 in
-h) -h)
@ -132,16 +144,16 @@ case $1 in
[ "$cmd" ] && usage 1 [ "$cmd" ] && usage 1
cmd=query cmd=query
;; ;;
-V|-f|-a|-p) -V|-f|-a|-p|-l)
[ "$cmd" ] && { [ "$cmd" ] && {
[ "$cmd" = query ] || usage 1 [ "$cmd" = query ] || usage 1
query_cmds="$cmd ${1:1:1}" query_cmds="$query_cmds ${1:1:1}"
} }
;; ;;
-i) -i)
[ "$cmd" ] && { [ "$cmd" ] && {
[ "$cmd" = query ] || usage 1 [ "$cmd" = query ] || usage 1
query_cmds="$cmd ${1:1:1}" query_cmds="$query_cmds ${1:1:1}"
continue continue
} }
cmd=install cmd=install