YUKI Hiroshi
null+****@clear*****
Sat Jun 28 02:12:29 JST 2014
YUKI Hiroshi 2014-06-28 02:12:29 +0900 (Sat, 28 Jun 2014) New Revision: ccbb093e3b6a542de1f9db024bd30c454704c86e https://github.com/droonga/droonga-engine/commit/ccbb093e3b6a542de1f9db024bd30c454704c86e Message: Save given base path to the environment variable Modified files: bin/droonga-engine-join Modified: bin/droonga-engine-join (+5 -2) =================================================================== --- bin/droonga-engine-join 2014-06-28 02:09:35 +0900 (9dfee7d) +++ bin/droonga-engine-join 2014-06-28 02:12:29 +0900 (4922553) @@ -22,6 +22,7 @@ require "json" require "pathname" require "droonga/engine/version" +require "droonga/path" require "droonga/catalog_generator" require "droonga/safe_file_writer" require "droonga/data_absorber" @@ -67,9 +68,11 @@ end parser.parse!(ARGV) -base_dir = options.base_dir || ENV["DROONGA_BASE_DIR"] +base_dir = options.base_dir || ENV[Droonga::Path::BASE_DIR_ENV_NAME] +base_dir = Pathname(base_dir).expand_path +ENV[Droonga::Path::BASE_DIR_ENV_NAME] = base_dir.to_s -catalog_path = Pathname(base_dir).expand_path + "catalog.json" +catalog_path = Droonga::Path.base + "catalog.json" source_catalog = JSON.parse(catalog_path.read) -------------- next part -------------- HTML����������������������������...Download