Merge pull request #3128 from jb-leger/revert_portable_env_args_trick

Revert portable env args trick

news/revert_portable_env_args_trick.rst

@@ -0,0 +1,25 @@
+**Added:**
+
+* <news item>
+
+**Changed:**
+
+* <news item>
+
+**Deprecated:**
+
+* <news item>
+
+**Removed:**
+
+* <news item>
+
+**Fixed:**
+
+* portable trick to pass args which replace '/usr/bin/env' is removed and
+  '/usr/bin/env' is used. Fixes bug when a python3 used is outside the default
+  'PATH'.
+
+**Security:**
+
+* <news item>

scripts/xonsh

@@ -1,7 +1,4 @@
-#!/bin/sh
-''''exec python3 -u "$0" "$@"
-'''#'
-# Portable trick to pass option [-u] to python3, more portable than /usr/bin/env.
+#!/usr/bin/env python3 -u
 
 from xonsh.main import main
 main()

scripts/xonsh-cat

@@ -1,7 +1,4 @@
-#!/bin/sh
-''''exec python3 -u "$0" "$@"
-'''#'
-# Portable trick to pass option [-u] to python3, more portable than /usr/bin/env.
+#!/usr/bin/env python3 -u
 
 from xonsh.xoreutils.cat import cat_main as main
 main()