Require e2tool

Signed-off-by: Tobias Ulmer <tu@emlix.com>

diff --git a/local/e2-build-numbers.lua b/local/e2-build-numbers.lua
index a8829d5a7592ed5a0495a20d0ed2cbbe63baf858..66b74280b7a2af051356f4f536f89f294803907f 100644 (file)
--- a/local/e2-build-numbers.lua
+++ b/local/e2-build-numbers.lua
@@ -26,7 +26,7 @@
 ]]
 
 local e2lib = require("e2lib")
-require("e2tool")
+local e2tool = require("e2tool")
 local e2option = require("e2option")
 local policy = require("policy")
 

diff --git a/local/e2-build.lua b/local/e2-build.lua
index bee29f7fe95f43bb26660eab8ceb5baa4ef1a59a..840a621bf868f064a2ed939203a61ae17a751593 100644 (file)
--- a/local/e2-build.lua
+++ b/local/e2-build.lua
@@ -26,7 +26,7 @@
 ]]
 
 local e2lib = require("e2lib")
-require("e2tool")
+local e2tool = require("e2tool")
 local e2build = require("e2build")
 local err = require("err")
 local e2option = require("e2option")

diff --git a/local/e2-cf.lua b/local/e2-cf.lua
index 9a355fa0a0336186192af6e5c14fc1c889ff67c0..58f68ee6651b8d329ad9c0b1adc7d39ba2f05edd 100644 (file)
--- a/local/e2-cf.lua
+++ b/local/e2-cf.lua
@@ -26,7 +26,7 @@
 ]]
 
 local e2lib = require("e2lib")
-require("e2tool")
+local e2tool = require("e2tool")
 local err = require("err")
 local e2option = require("e2option")
 

diff --git a/local/e2-dlist.lua b/local/e2-dlist.lua
index 526b6e53f0533f38f9ea3eab457f2c428c98ffa8..c5da5f1326caf63ae9c18b2956e3bc6699edd8bc 100644 (file)
--- a/local/e2-dlist.lua
+++ b/local/e2-dlist.lua
@@ -26,7 +26,7 @@
 ]]
 
 local e2lib = require("e2lib")
-require("e2tool")
+local e2tool = require("e2tool")
 local e2option = require("e2option")
 
 e2lib.init()

diff --git a/local/e2-dsort.lua b/local/e2-dsort.lua
index 0ba6f9d64cd9d43ba9770d6f03384a72d0c41aee..9de6838d73c569c4bc8344c88331bbbf0a9651b1 100644 (file)
--- a/local/e2-dsort.lua
+++ b/local/e2-dsort.lua
@@ -26,7 +26,7 @@
 ]]
 
 local e2lib = require("e2lib")
-require("e2tool")
+local e2tool = require("e2tool")
 local e2option = require("e2option")
 
 e2lib.init()

diff --git a/local/e2-fetch-sources.lua b/local/e2-fetch-sources.lua
index 3aba04eb33999a997245a08f4a98ef0ba03ea4d1..df5d3d64761e5164811459beea62eb5d7bae9b37 100644 (file)
--- a/local/e2-fetch-sources.lua
+++ b/local/e2-fetch-sources.lua
@@ -28,7 +28,7 @@
 -- fetch-sources - Retrieve sources for project -*- Lua -*-
 
 local e2lib = require("e2lib")
-require("e2tool")
+local e2tool = require("e2tool")
 local err = require("err")
 local e2option = require("e2option")
 local scm = require("scm")

diff --git a/local/e2-ls-project.lua b/local/e2-ls-project.lua
index 2f49f54629f80821c7aa7462a47128e0506eda12..d890179ec32acca023a2b5455463130e696f8521 100644 (file)
--- a/local/e2-ls-project.lua
+++ b/local/e2-ls-project.lua
@@ -28,7 +28,7 @@
 -- ls-project - show project information -*- Lua -*-
 
 local e2lib = require("e2lib")
-require("e2tool")
+local e2tool = require("e2tool")
 local err = require("err")
 local e2option = require("e2option")
 local scm = require("scm")

diff --git a/local/e2-new-source.lua b/local/e2-new-source.lua
index 7578814fa3a7e8f3d6877bf3e3ce43a81d88d29d..ea6be5f6b2f5834914be2de49a071f714ef8ecd1 100644 (file)
--- a/local/e2-new-source.lua
+++ b/local/e2-new-source.lua
@@ -29,7 +29,7 @@
 
 
 local e2lib = require("e2lib")
-require("e2tool")
+local e2tool = require("e2tool")
 local generic_git = require("generic_git")
 local cache = require("cache")
 local err = require("err")

diff --git a/local/e2-playground.lua b/local/e2-playground.lua
index 36c30f42a433a17cd4cf2aa0c7ee5be47bcd3d87..644b72da3ee1675750133c051a973e1dd473d433 100644 (file)
--- a/local/e2-playground.lua
+++ b/local/e2-playground.lua
@@ -28,7 +28,7 @@
 -- playground - enter existing chroot(1) environment -*- Lua -*-
 
 local e2lib = require("e2lib")
-require("e2tool")
+local e2tool = require("e2tool")
 local e2build = require("e2build")
 local err = require("err")
 local e2option = require("e2option")

diff --git a/local/e2build.lua b/local/e2build.lua
index 601ed9f5e25c875c934f085559d0f1cc74e39f3d..fe870f1492fd77b63393bdb7589e36f007facf68 100644 (file)
--- a/local/e2build.lua
+++ b/local/e2build.lua
@@ -32,6 +32,7 @@ local err = require("err")
 local e2lib = require("e2lib")
 local scm = require("scm")
 local environment = require("environment")
+local e2tool = require("e2tool")
 
 -- table of functions to drive the build process
 -- forward declaration, filled at the end of file

diff --git a/local/files.lua b/local/files.lua
index ee07a78882171e6b916fe2f812838bc798de39d5..2a5e054899d9a0d68dc2e58696787dae5f2d19b4 100644 (file)
--- a/local/files.lua
+++ b/local/files.lua
@@ -30,6 +30,7 @@ local scm = require("scm")
 local hash = require("hash")
 local err = require("err")
 local e2lib = require("e2lib")
+local e2tool = require("e2tool")
 
 plugin_descriptor = {
     description = "Files SCM Plugin",

diff --git a/local/git.lua b/local/git.lua
index dea93fe8791b4b0b8b5c6d4d7158aef99f69f003..7993bff3f353a58929e896fa86ed33c16274dcc0 100644 (file)
--- a/local/git.lua
+++ b/local/git.lua
@@ -34,6 +34,7 @@ local url = require("url")
 local err = require("err")
 local e2option = require("e2option")
 local e2lib = require("e2lib")
+local e2tool = require("e2tool")
 
 plugin_descriptor = {
     description = "Git SCM Plugin",