cleaning core_module(s)

sm · Jul 25, 2011 · 6e61170 · 6e61170
1 parent 60d77c2
commit 6e61170
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 13 deletions.
diff --git a/extensions/builtin/core/modules/shell/core/initialize b/extensions/builtin/core/modules/shell/core/initialize
@@ -63,10 +63,7 @@ source "${modules_path}/shell/core/dsl"
 source "${modules_path}/shell/modules/dsl"
 source "${modules_path}/shell/modules/initialize"
 
-for module in variables trace array logging time environment filesystem system users extensions
-do
-  core_module "$module"
-done
+core_modules variables trace array time logging environment filesystem system users extensions
 
 if os_is_solaris
 then # custom compilations + g*

diff --git a/extensions/builtin/core/modules/shell/modules/dsl b/extensions/builtin/core/modules/shell/modules/dsl
@@ -126,16 +126,19 @@ module_or_error()
   fi
 }
 
-# load a core module or fail
-core_module()
+# load core modules or fail
+core_modules()
 {
-  module=$1
-  module_name="core/$module"
-  module_path="${modules_path}/shell/$module"
-  if ! module "$module_name" skip_path_detection
-  then
-    fail "core module '${module_name}' is missing!!!"
-  fi
+  local module
+  for module in $@
+  do
+    module_name="core/$module"
+    module_path="${modules_path}/shell/$module"
+    if ! module "$module_name" skip_path_detection
+    then
+      fail "core module '${module_name}' is missing!!!"
+    fi
+  done
 }
 
 #