From ad75f7b127a566f7e4a90ecb86e9ef1f98fd32df Mon Sep 17 00:00:00 2001
From: mdipierro <massimo.dipierro@gmail.com>
Date: Wed, 18 Jul 2012 18:46:43 -0500
Subject: [PATCH] fixed global_settings.gluon_parent for scripts, thanks
 Vladyslav

---
 VERSION           |  2 +-
 gluon/main.py     | 14 +++++++++++++-
 gluon/settings.py | 11 +----------
 3 files changed, 15 insertions(+), 12 deletions(-)

diff --git a/VERSION b/VERSION
index ce038a12..17578627 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-Version 2.00.0 (2012-07-18 18:32:43) dev
+Version 2.00.0 (2012-07-18 18:46:40) dev
diff --git a/gluon/main.py b/gluon/main.py
index 97832023..806411a5 100644
--- a/gluon/main.py
+++ b/gluon/main.py
@@ -80,7 +80,7 @@ from http import HTTP, redirect
 from globals import Request, Response, Session
 from compileapp import build_environment, run_models_in, \
     run_controller_in, run_view_in
-from fileutils import copystream
+from fileutils import copystream, parse_version
 from contenttype import contenttype
 from dal import BaseAdapter
 from settings import global_settings
@@ -99,6 +99,18 @@ requests = 0    # gc timer
 
 # pattern used to validate client address
 regex_client = re.compile('[\w\-:]+(\.[\w\-]+)*\.?')  # ## to account for IPV6
+
+try:
+    version_info = open(os.path.join(global_settings.gluon_parent, 'VERSION'), 'r')
+    raw_version_string = version_info.read().strip()
+    version_info.close()
+    global_settings.web2py_version = parse_version(raw_version_string)
+except:
+    # when VERSION file is not found,
+    # when VERSION file is empty,
+    # when VERSION file is incorrect:
+    global_settings.web2py_version = parse_version()
+
 web2py_version = global_settings.web2py_version
 
 try:
diff --git a/gluon/settings.py b/gluon/settings.py
index b5f75f4a..18cf66f1 100644
--- a/gluon/settings.py
+++ b/gluon/settings.py
@@ -18,7 +18,7 @@ if not hasattr(os, 'mkdir'):
 if global_settings.db_sessions is not True:
     global_settings.db_sessions = set()
 
-global_settings.gluon_parent = os.environ.get('web2py_path', os.getcwd())
+global_settings.gluon_parent = os.environ.get('web2py_path', __file__.partition("gluon")[0])
 
 global_settings.applications_parent = global_settings.gluon_parent
 
@@ -33,12 +33,3 @@ global_settings.is_jython = 'java' in sys.platform.lower() or \
                             hasattr(sys, 'JYTHON_JAR') or \
                             str(sys.copyright).find('Jython') > 0
 
-version_info = open(os.path.join(global_settings.gluon_parent, 'VERSION'), 'r')
-raw_version_string = version_info.read().strip()
-version_info.close()
-
-from fileutils import parse_version # we need fileutils import here, because
-                                    # fileutils also imports settings
-global_settings.web2py_version = parse_version(raw_version_string)
-
-