3 files changed, 11 insertions, 27 deletions
diff --git a/development/google-go-lang/doinst.sh b/development/google-go-lang/doinst.sh
deleted file mode 100644
index 87208016c03f5..0000000000000
--- a/development/google-go-lang/doinst.sh
+++ /dev/null
@@ -1,15 +0,0 @@
-config() {
-  NEW="$1"
-  OLD="$(dirname $NEW)/$(basename $NEW .new)"
-  # If there's no config file by that name, mv it over:
-  if [ ! -r $OLD ]; then
-    mv $NEW $OLD
-  elif [ "$(cat $OLD | md5sum)" = "$(cat $NEW | md5sum)" ]; then
-    # toss the redundant copy
-    rm $NEW
-  fi
-  # Otherwise, we leave the .new copy for the admin to consider...
-}
-
-config etc/profile.d/go.csh.new
-config etc/profile.d/go.sh.new
diff --git a/development/google-go-lang/google-go-lang.SlackBuild b/development/google-go-lang/google-go-lang.SlackBuild
index eab757bd9c296..c27a6a60a8c99 100644
--- a/development/google-go-lang/google-go-lang.SlackBuild
+++ b/development/google-go-lang/google-go-lang.SlackBuild
@@ -27,8 +27,8 @@
 # SOFTWARE.
 
 PRGNAM=google-go-lang
-VERSION=${VERSION:-1.6.3}
-BUILD=${BUILD:-2}
+VERSION=${VERSION:-1.7}
+BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
 RELEASE=${RELEASE:-linux}
@@ -37,13 +37,13 @@ RUN_TEST=${RUN_TEST:-false}
 
 if [ -z "$ARCH" ]; then
   case "$( uname -m )" in
-    i?86) ARCH=i486 ;;
+    i?86) ARCH=i586 ;;
     arm*) ARCH=arm ;;
        *) ARCH=$( uname -m ) ;;
   esac
 fi
 
-if [ "$ARCH" = "i486" ]; then
+if [ "$ARCH" = "i586" ]; then
   LIBDIRSUFFIX=""
   GOARCH="386"
 elif [ "$ARCH" = "x86_64" ]; then
@@ -103,19 +103,19 @@ cd ..
 
 # Put the profile scripts for setting PATH and env variables
 mkdir -p $PKG/etc/profile.d
-cat > $PKG/etc/profile.d/go.csh.new << EOF
+cat > $PKG/etc/profile.d/go.csh << EOF
 #!/bin/csh
 setenv GOROOT ${GOROOT_FINAL}
 setenv PATH \${GOROOT}/bin:\${PATH}
 EOF
-cat > $PKG/etc/profile.d/go.sh.new << EOF
+cat > $PKG/etc/profile.d/go.sh << EOF
 #!/bin/sh
 export GOROOT="${GOROOT_FINAL}"
 export PATH="\${GOROOT}/bin:\${PATH}"
 EOF
 
-chmod 0755 $PKG/etc/profile.d/go.csh.new
-chmod 0755 $PKG/etc/profile.d/go.sh.new
+chmod 0755 $PKG/etc/profile.d/go.csh
+chmod 0755 $PKG/etc/profile.d/go.sh
 
 mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
 cp -a \
@@ -125,7 +125,6 @@ cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
 
 mkdir -p $PKG/install
 cat $CWD/slack-desc > $PKG/install/slack-desc
-cat $CWD/doinst.sh > $PKG/install/doinst.sh
 
 cd $PKG
 /sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
diff --git a/development/google-go-lang/google-go-lang.info b/development/google-go-lang/google-go-lang.info
index f115d81c56842..4ac63d31a6062 100644
--- a/development/google-go-lang/google-go-lang.info
+++ b/development/google-go-lang/google-go-lang.info
@@ -1,8 +1,8 @@
 PRGNAM="google-go-lang"
-VERSION="1.6.3"
+VERSION="1.7"
 HOMEPAGE="http://golang.org"
-DOWNLOAD="https://storage.googleapis.com/golang/go1.6.3.src.tar.gz"
-MD5SUM="bf3fce6ccaadd310159c9e874220e2a2"
+DOWNLOAD="https://storage.googleapis.com/golang/go1.7.src.tar.gz"
+MD5SUM="a30c3bd1a7fcc6a48acfb74936a19b4c"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES=""