let newpackage set additional fields

[zpackage] / zpm-rmpackage

diff --git a/zpm-rmpackage b/zpm-rmpackage
index 1292eda98dc7be6d592efc652a919e4160bb5843..4e8f10768686b4c991f528c76b5dd2f293066f61 100755 (executable)
--- a/zpm-rmpackage
+++ b/zpm-rmpackage
@@ -9,13 +9,15 @@ while getopts :f:vm: opt; do
        case $opt in
                f) pkgfile="$OPTARG" ;;
                v) verbose=1 ;;
-               m) message=$(zpm quote "$OPTARG") ;;
+               m) message="$OPTARG" ;;
        esac
 done
 shift $(( OPTIND - 1))
 
 if [ -z "$message" ]; then
        message=null
+else
+       message=$(zpm quote -q "$message")
 fi
 
 die() {
@@ -47,7 +49,7 @@ fi
                fi
                pkgid=$(zpm quote "$pkgid")
                printf "delete from packages_pkgid where pkgid = '$pkgid';\n"
-               printf "insert into zpmlog (action, target, info) values (%s,'%s',%s);\n" 'rmpackage', "$pkgid", "$message"
+               printf "insert into zpmlog (action, target, info) values ('rmpackage','%s',%s);\n" "$pkgid" "$message"
        done
        printf "commit;\n"
 } | zpm shell $pkgfile