X-Git-Url: https://git.distorted.org.uk/~mdw/termux-packages/blobdiff_plain/c8b6264e23c7deb2c66d56f593f39555b0d3e392..1e08b368778ad42cf4012a38bd0e417fcb7a6b8a:/build-package.sh

diff --git a/build-package.sh b/build-package.sh
index 14283087..474c0710 100755
--- a/build-package.sh
+++ b/build-package.sh
@@ -472,8 +472,8 @@ termux_step_massage () {
                 find . -type f | xargs file | grep -E "(executable|shared object)" | grep ELF | cut -f 1 -d : | xargs $STRIP --strip-unneeded --preserve-dates -R '.gnu.version*'
 	fi
         # Fix shebang paths:
-        for file in `find . -type f`; do
-                head -c 100 $file | grep -E "^#\!.*\\/bin\\/.*" | grep -q -E -v "^#\! ?\\/system" && sed --follow-symlinks -i -E "s@^#\!(.*)/bin/(.*)@#\!$TERMUX_PREFIX/bin/\2@" $file
+        for file in `find -L . -type f`; do
+                head -c 100 $file | grep -E "^#\!.*\\/bin\\/.*" | grep -q -E -v "^#\! ?\\/system" && sed --follow-symlinks -i -E "1 s@^#\!(.*)/bin/(.*)@#\!$TERMUX_PREFIX/bin/\2@" $file
         done
 	set -e -o pipefail
         # Remove DT_ entries which the android 5.1 linker warns about:
@@ -517,7 +517,8 @@ termux_step_massage () {
                 for includeset in $TERMUX_SUBPKG_INCLUDE; do
                         _INCLUDE_DIRSET=`dirname $includeset`
                         test "$_INCLUDE_DIRSET" = "." && _INCLUDE_DIRSET=""
-                        if [ -e $includeset ]; then
+                        if [ -e $includeset -o -L $includeset ]; then
+				# Add the -L clause to handle relative symbolic links:
                                 mkdir -p $SUB_PKG_MASSAGE_DIR/$_INCLUDE_DIRSET
                                 mv $includeset $SUB_PKG_MASSAGE_DIR/$_INCLUDE_DIRSET
                         fi
@@ -592,7 +593,7 @@ termux_setup_golang () {
 		exit 1
 	fi
 
-	local TERMUX_GO_VERSION=go1.6
+	local TERMUX_GO_VERSION=go1.6.1
 	local TERMUX_GO_PLATFORM=linux-amd64
 	test `uname` = "Darwin" && TERMUX_GO_PLATFORM=darwin-amd64