move sourcing db functions to functions/support, update #3236

rvm · Jan 4, 2015 · 5eb5e14 · 5eb5e14
1 parent 844eb6a
commit 5eb5e14
Show file tree

Hide file tree

Showing 7 changed files with 3 additions and 6 deletions.
diff --git a/scripts/base b/scripts/base
@@ -104,7 +104,7 @@ load_rvm_scripts()
 {
   typeset -a scripts
   scripts=(
-    selector logging db support utility init cleanup env rvmrc install environment gemset checksum list
+    selector logging support utility init cleanup env rvmrc install environment gemset checksum list
   )
 
   source "${rvm_scripts_path}/initialize"

diff --git a/scripts/db b/scripts/db
@@ -1,7 +1,6 @@
 #!/usr/bin/env bash
 
 source "${rvm_scripts_path:-$rvm_path/scripts}/functions/support"
-source "${rvm_scripts_path:-$rvm_path/scripts}/functions/db"
 
 usage()
 {

diff --git a/scripts/functions/support b/scripts/functions/support
@@ -281,6 +281,7 @@ __rvm_setup_utils_functions_common()
 __rvm_setup_utils_functions || return $?
 
 # detect system after setting up __rvm_sed and before setting up __rvm_statf
+source "${rvm_scripts_path}/functions/db"
 source "${rvm_scripts_path}/functions/detect_system"
 
 __rvm_setup_statf_function()

diff --git a/scripts/manage b/scripts/manage
@@ -13,7 +13,7 @@ source "$rvm_scripts_path/patches"
 source "$rvm_scripts_path/functions/build"
 source "$rvm_scripts_path/functions/pkg"
 source "$rvm_scripts_path/functions/irbrc"
-source "$rvm_scripts_path/functions/db"
+source "$rvm_scripts_path/functions/support"
 source "$rvm_scripts_path/functions/rubygems"
 source "$rvm_scripts_path/functions/manage/base"
 

diff --git a/scripts/notes b/scripts/notes
@@ -4,7 +4,6 @@
 : rvm_user_path:${rvm_user_path:="$rvm_path/user"}
 
 source "$rvm_scripts_path/initialize"
-source "$rvm_scripts_path/functions/db"
 source "$rvm_scripts_path/functions/logging"
 source "$rvm_scripts_path/functions/support"
 source "$rvm_scripts_path/functions/utility"

diff --git a/scripts/pkg b/scripts/pkg
@@ -10,7 +10,6 @@ rvm_base_except="selector"
 
 source "$rvm_scripts_path/base"
 source "$rvm_scripts_path/functions/build"
-source "$rvm_scripts_path/functions/db"
 source "$rvm_scripts_path/functions/pkg"
 
 set +o errexit

diff --git a/scripts/rubygems b/scripts/rubygems
@@ -1,7 +1,6 @@
 #!/usr/bin/env bash
 
 source "$rvm_scripts_path/base"
-source "$rvm_scripts_path/functions/db"
 source "$rvm_scripts_path/functions/rubygems"
 
 result=0