X-Git-Url: https://pd.if.org/git/?a=blobdiff_plain;f=zpm-rmpackage;h=4e8f10768686b4c991f528c76b5dd2f293066f61;hb=6d870f79b078509b8c8c3d4625db35b35feaae0f;hp=a09d0e2b8309e462dccd9e5a8aab4d73e9a955de;hpb=3b30aa3a5e24454c0c1d40f196a47ca55d3a32eb;p=zpackage diff --git a/zpm-rmpackage b/zpm-rmpackage index a09d0e2..4e8f107 100755 --- 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