From 74c1e5a9ed54141df5ef080287dadbf9cebfaaa6 Mon Sep 17 00:00:00 2001 From: Javi Fontan Date: Wed, 12 Sep 2012 19:35:47 +0200 Subject: [PATCH] appenv: move library instalation to its own directory --- env/bin/appenv | 5 +++-- env/install.sh | 4 ++-- env/lib/onechef.rb | 4 +--- 3 files changed, 6 insertions(+), 7 deletions(-) diff --git a/env/bin/appenv b/env/bin/appenv index 7cd96a1f69..c6d7d3ede5 100755 --- a/env/bin/appenv +++ b/env/bin/appenv @@ -24,14 +24,15 @@ else end $: << RUBY_LIB_LOCATION +$: << RUBY_LIB_LOCATION+"/apptools/env" $: << RUBY_LIB_LOCATION+"/cli" $: << '.' -require 'apptools/onechef.rb' +require 'onechef' require 'base64' require 'command_parser' -require 'apptools/appenv_helper' +require 'appenv_helper' require 'one_helper/onetemplate_helper' require 'pp' diff --git a/env/install.sh b/env/install.sh index ded89720b6..01761e0782 100755 --- a/env/install.sh +++ b/env/install.sh @@ -48,11 +48,11 @@ while true ; do done if [ -z "$ROOT" ]; then - LIB_LOCATION="/usr/lib/one/ruby/apptools" + LIB_LOCATION="/usr/lib/one/ruby/apptools/env" BIN_LOCATION="/usr/bin" PACKAGES_LOCATION="/usr/share/one/apptools" else - LIB_LOCATION="$ROOT/lib/ruby/apptools" + LIB_LOCATION="$ROOT/lib/ruby/apptools/env" BIN_LOCATION="$ROOT/bin" PACKAGES_LOCATION="$ROOT/share/apptools" fi diff --git a/env/lib/onechef.rb b/env/lib/onechef.rb index 1cd8cbfbc0..0f3c1a0a5b 100644 --- a/env/lib/onechef.rb +++ b/env/lib/onechef.rb @@ -17,13 +17,11 @@ require 'rubygems' require 'json' require 'OpenNebula' -#require 'OpenNebula/DocumentPool' -#require 'OpenNebula/Document' require 'OpenNebula/DocumentJSON' require 'OpenNebula/DocumentPoolJSON' -require 'apptools/onecast' +require 'onecast' module OpenNebula class ChefConf