change global __SCRIPT_DIR__ to __FILE__

virasak · Jan 28, 2009 · e27d48b · e27d48b
1 parent 7ad32a2
commit e27d48b
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 2 deletions.
diff --git a/gbatch b/gbatch
@@ -87,15 +87,16 @@ if (initScriptFile.exists()) {
 }
 
 
+// prepare shell and binding
 def binding = new Binding()
 def TERMINATE_SCRIPT = new Object()
 binding.setVariable('TERMINATE_SCRIPT', TERMINATE_SCRIPT) // return TERMINATE_SCRIPT to stop batch
-binding.setVariable('__SCRIPT_DIR__', scriptDir)
 def shell = new GroovyShell(binding)
 
 // process each script
 // if any script return TERMINATE_SCRIPT, exit the batch
 scriptFiles.every { 
   println "process '${it.target}' target"
+  binding.setVariable('__FILE__', it.file)
   TERMINATE_SCRIPT != shell.evaluate(it.file) 
 }
diff --git a/ibatis_gen/__init__.groovy b/ibatis_gen/__init__.groovy
@@ -1,5 +1,5 @@
 jdbc = [:]
-jdbc.url = "jdbc:sqlite:${__SCRIPT_DIR__.name}/ibatorgen.db"
+jdbc.url = "jdbc:sqlite:${__FILE__.parentFile.name}/ibatorgen.db"
 jdbc.driverClassName = 'org.sqlite.JDBC'
 jdbc.userName = ''
 jdbc.password = ''