some cleanup and better use of die() function, thanks paolo

web2py.py

@@ -1,28 +1,49 @@
 #!/usr/bin/env python
 # -*- coding: utf-8 -*-
 
+from __future__ import print_function
+
 import os
 import sys
 from multiprocessing import freeze_support
-# import gluon.import_all ##### This should be uncommented for py2exe.py
 
 if hasattr(sys, 'frozen'):
-    path = os.path.dirname(os.path.abspath(sys.executable))  # for py2exe
+    # py2exe
+    path = os.path.dirname(os.path.abspath(sys.executable))
 elif '__file__' in globals():
     path = os.path.dirname(os.path.abspath(__file__))
-else:  # should never happen
+else:
+    # should never happen
     path = os.getcwd()
+
+# process -f (--folder) option
+if '-f' in sys.argv:
+    fi = sys.argv.index('-f')
+elif '--folder' in sys.argv:
+    fi = sys.argv.index('--folder')
+else:
+    fi = None
+if fi and fi < len(sys.argv):
+    fi += 1
+    folder = sys.argv[fi]
+    if not os.path.isdir(os.path.join(folder, 'gluon')):
+        print("%s: error: bad folder %s" % (sys.argv[0], folder), file=sys.stderr)
+        sys.exit(1)
+    path = sys.argv[fi] = os.path.abspath(folder)
+
 os.chdir(path)
 
 sys.path = [path] + [p for p in sys.path if not p == path]
 
 # important that this import is after the os.chdir
 
+# import gluon.import_all # NOTE: should this be uncommented for py2exe.py ?
 import gluon.widget
 
-# Start Web2py and Web2py cron service!
 if __name__ == '__main__':
     freeze_support()
+    # support for sub-process coverage,
+    # see https://coverage.readthedocs.io/en/coverage-4.3.4/subprocess.html
     if 'COVERAGE_PROCESS_START' in os.environ:
         try:
             import coverage
@@ -30,4 +51,5 @@ if __name__ == '__main__':
         except:
             print('Coverage is not available')
             pass
-    gluon.widget.start(cron=True)
+    # start services
+    gluon.widget.start()