YUKI Hiroshi
null+****@clear*****
Thu Nov 1 16:38:17 JST 2012
YUKI Hiroshi 2012-11-01 16:38:17 +0900 (Thu, 01 Nov 2012) New Revision: 6d8555f4554a5130e3be8274488bb87cce9298f4 https://github.com/groonga/gcs/commit/6d8555f4554a5130e3be8274488bb87cce9298f4 Log: Export GCS_* environment variables even if there is no /etc/default/gcs Modified files: packages/debian/gcs.init packages/debian/gcs.upstart Modified: packages/debian/gcs.init (+5 -7) =================================================================== --- packages/debian/gcs.init 2012-11-01 16:33:27 +0900 (3c5de34) +++ packages/debian/gcs.init 2012-11-01 16:38:17 +0900 (5265324) @@ -40,13 +40,11 @@ DEFAULT_FILE=/etc/default/$NAME [ -x "$FOREVER" ] || exit 0 # Read configuration variable file if it is present -if [ -r $DEFAULT_FILE ]; then - . $DEFAULT_FILE - export GCS_DATABASE_PATH - export GCS_PORT - export GCS_BASE_HOST - export GCS_PRIVILEGED_RANGES -fi +[ -r $DEFAULT_FILE ] && . $DEFAULT_FILE +export GCS_DATABASE_PATH +export GCS_PORT +export GCS_BASE_HOST +export GCS_PRIVILEGED_RANGES [ "$ENABLE" = "yes" ] || exit 0 Modified: packages/debian/gcs.upstart (+7 -7) =================================================================== --- packages/debian/gcs.upstart 2012-11-01 16:33:27 +0900 (00affe4) +++ packages/debian/gcs.upstart 2012-11-01 16:38:17 +0900 (98b372d) @@ -12,13 +12,13 @@ setgid gcs script HOME=`echo ~gcs` export HOME + DEFAULT_FILE=/etc/default/gcs - if [ -r $DEFAULT_FILE ]; then - . $DEFAULT_FILE - export GCS_DATABASE_PATH - export GCS_PORT - export GCS_BASE_HOST - export GCS_PRIVILEGED_RANGES - fi + [ -r $DEFAULT_FILE ] && . $DEFAULT_FILE + export GCS_DATABASE_PATH + export GCS_PORT + export GCS_BASE_HOST + export GCS_PRIVILEGED_RANGES + exec /usr/sbin/gcs end script -------------- next part -------------- HTML����������������������������...Download