YUKI Hiroshi
null+****@clear*****
Thu Sep 25 18:08:33 JST 2014
YUKI Hiroshi 2014-09-25 18:08:33 +0900 (Thu, 25 Sep 2014) New Revision: f65bbbd9493097b7589d7ed7d0488d550e433a17 https://github.com/droonga/droonga-engine/commit/f65bbbd9493097b7589d7ed7d0488d550e433a17 Message: Detect location of the base directory correctly if it is service installation Modified files: bin/droonga-engine-catalog-generate bin/droonga-engine-catalog-modify Modified: bin/droonga-engine-catalog-generate (+9 -1) =================================================================== --- bin/droonga-engine-catalog-generate 2014-09-25 17:27:39 +0900 (afc873e) +++ bin/droonga-engine-catalog-generate 2014-09-25 18:08:33 +0900 (3752857) @@ -23,6 +23,10 @@ require "pathname" require "droonga/engine/version" require "droonga/catalog_generator" require "droonga/safe_file_writer" +require "droonga/service_installation" + +service_installation = Droonga::ServiceInstallation.new +service_installation.ensure_using_service_base_directory generator = Droonga::CatalogGenerator.new current_dataset = {} @@ -31,7 +35,11 @@ datasets = { } options = OpenStruct.new -options.output_path = "-" +if service_installation.user_exist? + options.output_path = Droonga::Path.catalog +else + options.output_path = "-" +end parser = OptionParser.new parser.version = Droonga::Engine::VERSION parser.on("--output=PATH", Modified: bin/droonga-engine-catalog-modify (+11 -2) =================================================================== --- bin/droonga-engine-catalog-modify 2014-09-25 17:27:39 +0900 (5998cae) +++ bin/droonga-engine-catalog-modify 2014-09-25 18:08:33 +0900 (d26bf75) @@ -23,6 +23,10 @@ require "pathname" require "droonga/engine/version" require "droonga/catalog_generator" require "droonga/safe_file_writer" +require "droonga/service_installation" + +service_installation = Droonga::ServiceInstallation.new +service_installation.ensure_using_service_base_directory generator = Droonga::CatalogGenerator.new current_dataset = {} @@ -31,9 +35,14 @@ datasets = { } options = OpenStruct.new -options.source_path = "./catalog.json" options.output_path = "-" -options.update = false +if service_installation.user_exist? + options.source_path = Droonga::Path.catalog + options.update = true +else + options.source_path = "./catalog.json" + options.update = false +end parser = OptionParser.new parser.version = Droonga::Engine::VERSION parser.on("--source=PATH", -------------- next part -------------- HTML����������������������������...Download