mirror of
https://github.com/OpenNebula/one.git
synced 2026-11-21 04:12:37 +09:00
appenv: move library instalation to its own directory
This commit is contained in:
1 parent
a89e690f66
commit
74c1e5a9ed
3 files changed
+6
-7
No files matched your search
Vendored
+3
-2
@@ -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'
|
||||
|
||||
Vendored
+2
-2
@@ -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
|
||||
|
||||
Vendored
+1
-3
@@ -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
|
||||
|
||||
Reference in new issue
Block a user