git » go-1.20.git » commit 748b144

diff --git a/PKGBUILD b/PKGBUILD
index 5d8d855..99a093d 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -9,7 +9,7 @@
 
 pkgname=go
 pkgver=1.2
-pkgrel=1
+pkgrel=2
 epoch=2
 pkgdesc='Compiler and tools for the Go programming language from Google'
 arch=('x86_64' 'i686')
@@ -23,15 +23,11 @@ install="$pkgname.install"
 backup=('usr/lib/go/bin')
 
 if [ "$CARCH" == 'x86_64' ]; then
-  source=("http://go.googlecode.com/files/${pkgname}$pkgver.linux-amd64.tar.gz"
-          "$pkgname.sh")
-  sha256sums=('1252ca0aa0a96d53c0592fbc4ea9c9ff5c6b588169c92e08d06da9d89d9d91f2'
-              'b6209904c88bde96efcac846c267e308e4dc39c8a45f2690204c2175de4b9b0a')
+  source=("http://go.googlecode.com/files/${pkgname}$pkgver.linux-amd64.tar.gz")
+  sha256sums=('1252ca0aa0a96d53c0592fbc4ea9c9ff5c6b588169c92e08d06da9d89d9d91f2')
 else
-  source=("http://go.googlecode.com/files/${pkgname}$pkgver.linux-386.tar.gz"
-          "$pkgname.sh")
-  sha256sums=('3f51aacc7af60c520fe1071f3cb1d9ceee5db0e8fdfb7168a73e12fd7603e651'
-              'b6209904c88bde96efcac846c267e308e4dc39c8a45f2690204c2175de4b9b0a')
+  source=("http://go.googlecode.com/files/${pkgname}$pkgver.linux-386.tar.gz")
+  sha256sums=('3f51aacc7af60c520fe1071f3cb1d9ceee5db0e8fdfb7168a73e12fd7603e651')
 fi
 
 build() {
@@ -40,10 +36,9 @@ build() {
   export GOROOT_FINAL=/usr/lib/go
 
   #
-  # Arch Linux doesn't support SSE2 for i686.
-  #
-  # Use "go-sse2" from AUR if you have am i686 CPU that supports SSE2.
-  # It is highly likely that it does, and the SSE2 version is _a lot_ faster.
+  # Arch Linux doesn't support SSE2 for i686 (to support older CPUs)
+  # The SSE2 version is _a lot_ faster for i686.
+  # This line disables it.
   #
   export GO386=387
 
@@ -133,9 +128,6 @@ package() {
   install -Dm644 src/pkg/runtime/cgocall.h \
     "$pkgdir/usr/lib/go/src/pkg/runtime/cgocall.h"
 
-  # For packages that source /etc/profile.d/go.sh
-  install -Dm755 "$srcdir/$pkgname.sh" "$pkgdir/etc/profile.d/$pkgname.sh"
-
   # This is to make go get code.google.com/p/go-tour/gotour and
   # then running the gotour executable work out of the box.
   ln -sf /usr/bin "$pkgdir/usr/lib/go/bin"
diff --git a/go.install b/go.install
index e0610f3..286aaf9 100644
--- a/go.install
+++ b/go.install
@@ -1,10 +1,13 @@
 post_install() {
   # Friendly message for new users
-  echo "Example use of the \"go\" tool:"
-  echo '    mkdir ~/mygoproject'
-  echo '    export GOPATH=~/mygoproject'
-  echo '    export PATH=\$PATH:\$GOPATH/bin'
-  echo '    go get github.com/codegangsta/martini'
+  echo
+  echo 'Example use of the "go" tool:'
+  echo
+  echo '    mkdir ~/go'
+  echo '    export GOPATH=~/go'
+  echo '    export PATH=$PATH:~/go/bin'
+  echo '    go get code.google.com/p/go-tour/gotour'
+  echo
 }
 
 # vim:set ts=2 sw=2 et:
diff --git a/go.sh b/go.sh
deleted file mode 100644
index 8393dc8..0000000
--- a/go.sh
+++ /dev/null
@@ -1 +0,0 @@
-export GOROOT=/usr/lib/go