google-go-lang: fix my dumb mistakes

1 files changed, 6 insertions, 7 deletions

diff --git a/google-go-lang/build/google-go-lang.SlackBuild b/google-go-lang/build/google-go-lang.SlackBuild
index ef469060..6ab1cb7b 100755
--- a/google-go-lang/build/google-go-lang.SlackBuild
+++ b/google-go-lang/build/google-go-lang.SlackBuild
@@ -1,4 +1,4 @@
-#!/bin/sh
+#!/bin/bash
 # $Id$
 # Copyright 2012, 2013, 2014, 2015, 2016, 2017, 2018  Vincent Batts
 # Copyright 2012 Eric Schultz
@@ -181,13 +181,13 @@ if [ "$ARCH" = "i586" ]; then
   # This 1.4 release is the last to be compiled with a C compiler.
   echo "-- Compiling go1.4 bootstrap compiler on ARCH $ARCH..."
   tar -C $TMP/tmp-$PRGNAM -xf ${SOURCE[1]}
-  cd $TMP/tmp-$PRGNAM/go
+  pushd $TMP/tmp-$PRGNAM/go
     export GOROOT=$TMP/tmp-$PRGNAM/go
     cd ./src
     LC_ALL=C ./make.bash \
       2>&1 | tee $OUTPUT/make-${PRGNAM}_bootstrap.log
-  cd - 1>/dev/null
-  export GOROOT_BOOTSTRAP="$TMP/go"
+  popd
+  export GOROOT_BOOTSTRAP="$TMP/tmp-$PRGNAM/go"
 else
   # gcc 5+ is go1.4 API, so we'll bootstrap with it
   export GOROOT_BOOTSTRAP="/usr"
@@ -199,9 +199,11 @@ export GOROOT="$(pwd)"
 export GOROOT_FINAL="/usr/lib${LIBDIRSUFFIX}/go${VERSION}/go"
 
 cd src
+  echo "-- Compiling go${VERSION} suite using bootstrap ${GOROOT_BOOTSTRAP} ..."
   LC_ALL=C ./make.bash \
     2>&1 | tee $OUTPUT/make-${PRGNAM}.log
   # As of go1.5, golang supports shared libraries, so generate them for use.
+  echo "-- Installing go${VERSION} suite..."
   $GOROOT/bin/go install -buildmode=shared std \
     2>&1 | tee $OUTPUT/install-${PRGNAM}.log
 cd - 1>/dev/null
@@ -212,9 +214,6 @@ rm -rf pkg/obj/go-build/*
 # Remove the doc Makefile:
 rm -f doc/Makefile
 
-# Create the GO ROOT directory:
-mkdir -p $PKG$GOROOT_FINAL
-
 # Add profile scripts for go:
 mkdir -p $PKG/etc/profile.d
 cat << EOT > $PKG/etc/profile.d/go.csh