@@ -9,7 +9,7 @@
 from ..utils.fs import make_tree, copy_file, copy_tree, remove_file, remove_tree
 from ..utils.log import debug, log
 from ..utils.system import ldd, system
-from ..utils.template import copy_template
+from ..utils.template import copy_template, load_template
 
 
 __all__ = ["patch_binary", "relocate_python"]
@@ -122,6 +122,10 @@ def relocate_python(python=None, appdir=None):
     target = PYTHON_BIN + '/' + PYTHON_X_Y
     copy_file(source, target, update=True)
 
+    relpath = os.path.relpath(target, APPDIR_BIN)
+    make_tree(APPDIR_BIN)
+    os.symlink(relpath, APPDIR_BIN + '/' + PYTHON_X_Y)
+
     copy_tree(HOST_PKG, PYTHON_PKG)
     copy_tree(HOST_INC, PYTHON_INC)
 
@@ -146,7 +150,6 @@ def relocate_python(python=None, appdir=None):
         shutil.copymode(pip_source, target)
 
         relpath = os.path.relpath(target, APPDIR_BIN)
-        make_tree(APPDIR_BIN)
         os.symlink(relpath, APPDIR_BIN + '/' + PIP_X_Y)
 
 
@@ -161,20 +164,6 @@ def relocate_python(python=None, appdir=None):
         remove_tree(path)
 
 
-    # Wrap the Python executable
-    log('WRAP', '%s executable', PYTHON_X_Y)
-
-    with open(PREFIX + '/data/python-wrapper.sh') as f:
-        text = f.read()
-    text = text.replace('{{PYTHON}}', PYTHON_X_Y)
-
-    make_tree(APPDIR_BIN)
-    target = APPDIR_BIN + '/' + PYTHON_X_Y
-    with open(target, 'w') as f:
-        f.write(text)
-    shutil.copymode(PYTHON_BIN + '/' + PYTHON_X_Y, target)
-
-
     # Set or update symlinks to python
     pythons = glob.glob(APPDIR_BIN + '/python?.*')
     versions = [os.path.basename(python)[6:] for python in pythons]
@@ -285,7 +274,8 @@ def relocate_python(python=None, appdir=None):
     apprun = APPDIR + '/AppRun'
     if not os.path.exists(apprun):
         log('INSTALL', 'AppRun')
-        entrypoint = '"${{APPDIR}}/usr/bin/python{:}" "$@"'.format(VERSION)
+        entrypoint_path = PREFIX + '/data/entrypoint.sh'
+        entrypoint = load_template(entrypoint_path, python=PYTHON_X_Y)
         _copy_template('apprun.sh', apprun, entrypoint=entrypoint)
 
 
 
@@ -5,5 +5,10 @@ self="$(readlink -f -- $0)"
 here="${self%/*}"
 APPDIR="${APPDIR:-${here}}"
 
+# Export TCl/Tk
+export TCL_LIBRARY="${APPDIR}/usr/share/tcltk/tcl{{ tcl-version }}"
+export TK_LIBRARY="${APPDIR}/usr/share/tcltk/tk{{ tk-version }}"
+export TKPATH="${TK_LIBRARY}"
+
 # Call the entry point
 {{ entrypoint }}
@@ -0,0 +1,25 @@
+for opt in "$@"
+do
+    [ "${opt:0:1}" != "-" ] && break
+    if [[ "${opt}" =~ "I" ]] || [[ "${opt}" =~ "E" ]]; then
+        # Environment variables are disabled ($PYTHONHOME). Let's run in a safe
+        # mode from the raw Python binary inside the AppImage
+        "$APPDIR/opt/{{ python }}/bin/{{ python }}" "$@"
+        exit "$?"
+    fi
+done
+
+# Get the executable name, i.e. the AppImage or the python binary if running from an
+# extracted image
+executable="${APPDIR}/opt/{{ python }}/{{ python }}"
+if [[ "${ARGV0}" =~ "/" ]]; then
+    executable="$(cd $(dirname ${ARGV0}) && pwd)/$(basename ${ARGV0})"
+elif [[ "${ARGV0}" != "" ]]; then
+    executable=$(which "${ARGV0}")
+fi
+
+# Wrap the call to Python in order to mimic a call from the source
+# executable ($ARGV0), but potentially located outside of the Python
+# install ($PYTHONHOME)
+(PYTHONHOME="${APPDIR}/opt/{{ python }}" exec -a "${executable}" "$APPDIR/opt/{{ python }}/bin/{{ python }}" "$@")
+exit "$?"