HAYASHI Kentaro
null+****@clear*****
Tue Dec 10 12:48:23 JST 2013
HAYASHI Kentaro 2013-12-10 12:48:23 +0900 (Tue, 10 Dec 2013) New Revision: a9f8a812b4bf84454cba3b2f65e6ae5c70445012 https://github.com/groonga/groonga/commit/a9f8a812b4bf84454cba3b2f65e6ae5c70445012 Message: deb: cleanup debian/groonga-*{postinst,postrm} files [groonga-dev,01930] Patch by Hideki Yamane. Thanks!!! Modified files: packages/debian/groonga-httpd.postinst packages/debian/groonga-httpd.postrm packages/debian/groonga-server-common.postinst packages/debian/groonga-server-common.postrm Modified: packages/debian/groonga-httpd.postinst (+4 -8) =================================================================== --- packages/debian/groonga-httpd.postinst 2013-12-08 23:52:52 +0900 (cacccc0) +++ packages/debian/groonga-httpd.postinst 2013-12-10 12:48:23 +0900 (288c648) @@ -2,15 +2,11 @@ set -e -prevver="$2" - fixperms() { - dpkg-statoverride --list /etc/groonga/httpd >/dev/null || \ - dpkg-statoverride --update --add groonga groonga 0755 /etc/groonga/httpd - dpkg-statoverride --list /etc/groonga/httpd/logs >/dev/null || \ - dpkg-statoverride --update --add groonga groonga 0755 /etc/groonga/httpd/logs - dpkg-statoverride --list /var/log/groonga/httpd >/dev/null || \ - dpkg-statoverride --update --add groonga groonga 0755 /var/log/groonga/httpd + for target in /etc/groonga/httpd /etc/groonga/httpd/logs /var/log/groonga/httpd + do + dpkg-statoverride --list $target >/dev/null || dpkg-statoverride --update --add groonga groonga 0755 $target + done } case "$1" in Modified: packages/debian/groonga-httpd.postrm (+4 -7) =================================================================== --- packages/debian/groonga-httpd.postrm 2013-12-08 23:52:52 +0900 (09a818f) +++ packages/debian/groonga-httpd.postrm 2013-12-10 12:48:23 +0900 (816a1e6) @@ -3,13 +3,10 @@ set -e if [ "$1" = "purge" ]; then - rm -f /var/run/groonga/* - rm -rf /var/log/groonga/httpd/* - dpkg-statoverride --remove /var/log/groonga/httpd - rm -rf /etc/groonga/httpd/logs/* - dpkg-statoverride --remove /etc/groonga/httpd/logs - rm -rf /etc/groonga/httpd/* - dpkg-statoverride --remove /etc/groonga/httpd + for target in /var/log/groonga/httpd /etc/groonga/httpd/logs /etc/groonga/httpd + do + dpkg-statoverride --remove $target; rm -rf $target + done fi #DEBHELPER# Modified: packages/debian/groonga-server-common.postinst (+4 -10) =================================================================== --- packages/debian/groonga-server-common.postinst 2013-12-08 23:52:52 +0900 (06c539d) +++ packages/debian/groonga-server-common.postinst 2013-12-10 12:48:23 +0900 (394bd70) @@ -2,8 +2,6 @@ set -e -prevver="$2" - add_system_user() { if ! getent passwd groonga >/dev/null; then adduser --group --system --home /var/lib/groonga groonga @@ -11,14 +9,10 @@ add_system_user() { } fixperms() { - dpkg-statoverride --list /var/run/groonga >/dev/null || \ - dpkg-statoverride --update --add groonga groonga 0755 /var/run/groonga - dpkg-statoverride --list /var/lib/groonga >/dev/null || \ - dpkg-statoverride --update --add groonga groonga 0755 /var/lib/groonga - dpkg-statoverride --list /etc/groonga >/dev/null || \ - dpkg-statoverride --update --add groonga groonga 0755 /etc/groonga - dpkg-statoverride --list /var/log/groonga >/dev/null || \ - dpkg-statoverride --update --add groonga groonga 0755 /var/log/groonga + for target in /var/run/groonga /var/lib/groonga /etc/groonga /var/log/groonga + do + dpkg-statoverride --list $target >/dev/null || dpkg-statoverride --update --add groonga groonga 0755 $target + done } create_database() { Modified: packages/debian/groonga-server-common.postrm (+4 -8) =================================================================== --- packages/debian/groonga-server-common.postrm 2013-12-08 23:52:52 +0900 (b55684d) +++ packages/debian/groonga-server-common.postrm 2013-12-10 12:48:23 +0900 (e706db8) @@ -3,14 +3,10 @@ set -e if [ "$1" = "purge" ]; then - rm -f /var/run/groonga/* - dpkg-statoverride --remove /var/run/groonga - rm -rf /var/lib/groonga/* - dpkg-statoverride --remove /var/lib/groonga - rm -rf /etc/groonga/* - dpkg-statoverride --remove /etc/groonga - rm -rf /var/log/groonga/* - dpkg-statoverride --remove /var/log/groonga + for target in /var/run/groonga /var/lib/groonga /var/log/groonga /etc/groonga + do + dpkg-statoverride --remove $target; rm -rf $target + done fi #DEBHELPER# -------------- next part -------------- HTML����������������������������...Download