X-Git-Url: https://git.proxmox.com/?a=blobdiff_plain;f=BaseTools%2FBin%2FCYGWIN_NT-5.1-i686%2FTrim;fp=BaseTools%2FBin%2FCYGWIN_NT-5.1-i686%2FTrim;h=7cac4f7c4fff29fbb4981a25c4492d38317a1fca;hb=6928c1d3eed8fb3ab0b136f0ebdcef50f7bda2f3;hp=2cb8b86a9931690d9ea8f10a7df6c3bbe35e6afa;hpb=59fae92d8d8d3d5471e59cc2922080854b570e7c;p=mirror_edk2.git

diff --git a/BaseTools/Bin/CYGWIN_NT-5.1-i686/Trim b/BaseTools/Bin/CYGWIN_NT-5.1-i686/Trim
index 2cb8b86a99..7cac4f7c4f 100755
--- a/BaseTools/Bin/CYGWIN_NT-5.1-i686/Trim
+++ b/BaseTools/Bin/CYGWIN_NT-5.1-i686/Trim
@@ -1,5 +1,14 @@
 #!/usr/bin/env bash
 #python `dirname $0`/RunToolFromSource.py `basename $0` $*
-PYTHONPATH="`dirname $0`/../../Source/Python" \
-    python "`dirname $0`/../../Source/Python"/`basename $0`/`basename $0`.py $*
 
+# If a python2 command is available, use it in preference to python
+if command -v python2 >/dev/null 2>&1; then
+    python_exe=python2
+fi
+
+full_cmd=${BASH_SOURCE:-$0} # see http://mywiki.wooledge.org/BashFAQ/028 for a discussion of why $0 is not a good choice here
+dir=$(dirname "$full_cmd")
+exe=$(basename "$full_cmd")
+
+export PYTHONPATH="$dir/../../Source/Python"
+exec "${python_exe:-python}" "$dir/../../Source/Python/$exe/$exe.py" "$@"