[PATCH cygport] Improve __fix_shebang()

[PATCH cygport] Improve __fix_shebang()

[Lemures Lemniscati]

[-- Attachment #1: Type: text/plain, Size: 753 bytes --]

Hi!

This is a patch for improving __fix_shebang(),
in case a shebang uses 'env'.
(just gobbling a word after 'env')


diff --git a/lib/src_install.cygpart b/lib/src_install.cygpart
index cca7347..d101f5b 100644
--- a/lib/src_install.cygpart
+++ b/lib/src_install.cygpart
@@ -103,7 +103,9 @@ __fix_shebang() {
 			continue
 		fi
 
-		sed -i -e "s|#! */[^ ]*\(.*\)|#! ${interp}\1|" ${x}
+		# Note: This pattern does not work when 'env' with
+		#       any option or any variable-setting.
+		sed -i -e 's;^#![[:space:]]*\(\([^[:space:]]*/\|\)env[[:space:]]*[^[:space:]][^[:space:]]*\|[^[:space:]]*\)\(.*\);#!'"${interp}"'\3;' ${x}
 	done
 }
 
-- 
2.30.0

A test script for the same pattern is attached as a.sh

Regards,
Lem


[-- Attachment #2: a.sh --]
[-- Type: application/octet-stream, Size: 544 bytes --]

#!/bin/bash

interp=xxxINTERPxxx

sed -e '=;P' \
    -e 's;^#![[:space:]]*\(\([^[:space:]]*/\|\)env[[:space:]]*[^[:space:]][^[:space:]]*\|[^[:space:]]*\)\(.*\);#!'"${interp}"'\3;' \
<<_END
#!/bin/bash foo  bar  baz
#!/bin/bash  foo  bar  baz
#! /bin/bash  foo  bar  baz
#!  /bin/bash  foo  bar  baz
#!/usr/bin/env foo  bar  baz
#!/usr/bin/env  foo  bar  baz
#! /usr/bin/env  foo  bar  baz
#!  /usr/bin/env	foo  bar  baz
#!	 /bin/env   foo  bar  baz
#!	 /bin/env	foo  bar  baz
#!	 /bin/env 	 foo  bar  baz
#!/this/will/fail/env TZ=EST bash
_END