YUKI Hiroshi
null+****@clear*****
Sat Jun 28 02:56:01 JST 2014
YUKI Hiroshi 2014-06-28 02:56:01 +0900 (Sat, 28 Jun 2014) New Revision: 473c07aea16be13481fe645f6461310f606c0d09 https://github.com/droonga/droonga-engine/commit/473c07aea16be13481fe645f6461310f606c0d09 Message: Show default base dir Modified files: bin/droonga-engine-join bin/droonga-engine-unjoin Modified: bin/droonga-engine-join (+4 -3) =================================================================== --- bin/droonga-engine-join 2014-06-28 02:54:31 +0900 (ca297e9) +++ bin/droonga-engine-join 2014-06-28 02:56:01 +0900 (fdf98c9) @@ -28,6 +28,7 @@ require "droonga/data_absorber" require "droonga/serf" options = OpenStruct.new +options.base_dir = ENV[Droonga::Path::BASE_DIR_ENV_NAME] || Dir.pwd options.dataset = "Default" options.port = 10031 options.tag = "droonga" @@ -38,7 +39,8 @@ parser = OptionParser.new parser.version = Droonga::Engine::VERSION parser.on("--base-dir=PATH", - "Path to the base directory the catalog.json is located in.") do |path| + "Path to the base directory the catalog.json is located in.", + "(#{options.base_dir})") do |path| options.base_dir = path end @@ -67,8 +69,7 @@ end parser.parse!(ARGV) -base_dir = options.base_dir || ENV[Droonga::Path::BASE_DIR_ENV_NAME] || Dir.pwd -base_dir = Pathname(base_dir).expand_path +base_dir = Pathname(options.base_dir).expand_path ENV[Droonga::Path::BASE_DIR_ENV_NAME] = base_dir.to_s catalog_path = Droonga::Path.base + "catalog.json" Modified: bin/droonga-engine-unjoin (+4 -3) =================================================================== --- bin/droonga-engine-unjoin 2014-06-28 02:54:31 +0900 (a04c032) +++ bin/droonga-engine-unjoin 2014-06-28 02:56:01 +0900 (645cdf0) @@ -28,6 +28,7 @@ require "droonga/data_absorber" require "droonga/serf" options = OpenStruct.new +options.base_dir = ENV[Droonga::Path::BASE_DIR_ENV_NAME] || Dir.pwd options.dataset = "Default" options.port = 10031 options.tag = "droonga" @@ -37,7 +38,8 @@ parser = OptionParser.new parser.version = Droonga::Engine::VERSION parser.on("--base-dir=PATH", - "Path to the base directory the catalog.json is located in.") do |path| + "Path to the base directory the catalog.json is located in.", + "(#{options.base_dir})") do |path| options.base_dir = path end @@ -51,8 +53,7 @@ end parser.parse!(ARGV) -base_dir = options.base_dir || ENV[Droonga::Path::BASE_DIR_ENV_NAME] || Dir.pwd -base_dir = Pathname(base_dir).expand_path +base_dir = Pathname(options.base_dir).expand_path ENV[Droonga::Path::BASE_DIR_ENV_NAME] = base_dir.to_s catalog_path = Droonga::Path.base + "catalog.json" -------------- next part -------------- HTML����������������������������...Download