diff --git a/gluon/shell.py b/gluon/shell.py index 63167fad..e6cb9823 100644 --- a/gluon/shell.py +++ b/gluon/shell.py @@ -88,7 +88,7 @@ def exec_environment( mo = re.match(r'(|.*/)applications/(?P[^/]+)', pyfile) if mo: appname = mo.group('appname') - request.folder = os.path.join('applications', appname) + request.folder = os.path.abspath(os.path.join('applications', appname)) else: request.folder = '' env = build_environment(request, response, session, store_current=False) diff --git a/gluon/widget.py b/gluon/widget.py index fbd522ae..ce731e5d 100644 --- a/gluon/widget.py +++ b/gluon/widget.py @@ -943,7 +943,9 @@ def console(): k = len(sys.argv) sys.argv, other_args = sys.argv[:k], sys.argv[k + 1:] (options, args) = parser.parse_args() - options.args = [options.run] + other_args + options.args = other_args + if options.run: + options.args.insert(0, options.run) copy_options = copy.deepcopy(options) copy_options.password = '******'