From 76ad7247932b92f12291afcbea287ad643b1f380 Mon Sep 17 00:00:00 2001
From: Ambrose Chua <ambrose@chua.family>
Date: Sat, 22 Sep 2018 17:12:59 +0800
Subject: [PATCH] Bump Golang, Node keys and clean neovim

---
 .install/golang.sh | 1 +
 .install/neovim.sh | 5 +----
 .install/node.sh   | 1 +
 .versions          | 1 +
 4 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/.install/golang.sh b/.install/golang.sh
index 1a0009b..a83cb91 100755
--- a/.install/golang.sh
+++ b/.install/golang.sh
@@ -28,6 +28,7 @@ GOHOSTARCH="$(go env GOHOSTARCH)"
 
 wget -O go.tgz "https://golang.org/dl/go$GOLANG_VERSION.src.tar.gz"
 
+echo "$GOLANG_HASH *go.tgz" | sha256sum -c -
 tar -C /usr/local -xzf go.tgz
 rm go.tgz
 cd /usr/local/go/src
diff --git a/.install/neovim.sh b/.install/neovim.sh
index e5b2663..5f90154 100755
--- a/.install/neovim.sh
+++ b/.install/neovim.sh
@@ -8,6 +8,7 @@ echo "Installing neovim $NEOVIM_VERSION..."
 echo
 
 apk add --no-cache \
+    gettext \
 	unibilium \
 	libtermkey \
 	libvterm \
@@ -38,10 +39,6 @@ if [ "$NEOVIM_VERSION" = "nightly" ]; then
 else
 	git checkout v$NEOVIM_VERSION
 fi
-if [ "$NEOVIM_VERSION" = "0.2.2" ]; then
-	# temp fix for #8056 until next release
-	sed -i 's/https:\/\/raw\.githubusercontent\.com\/mpeterv\/luacheck\/master\/luacheck-scm-1\.rockspec/https:\/\/luarocks\.org\/manifests\/mpeterv\/luacheck-0\.21\.2-1\.rockspec/g' third-party/cmake/BuildLuarocks.cmake
-fi
 make CMAKE_EXTRA_FLAGS=-DENABLE_JEMALLOC=OFF >/dev/null || make
 make install
 cd ..
diff --git a/.install/node.sh b/.install/node.sh
index 4d05e50..074f35c 100755
--- a/.install/node.sh
+++ b/.install/node.sh
@@ -31,6 +31,7 @@ for key in \
 	B9AE9905FFD7803F25714661B63B535A4C206CA9 \
 	56730D5401028683275BD23C23EFEFE93C4CFFFE \
 	77984A986EBC2AA786BC0F66B01FBB92821C587A \
+	8FCCA13FEF1D0C2E91008E09770F7A9A5AE15600 \
 ; do
 	gpg --keyserver hkp://p80.pool.sks-keyservers.net:80 --recv-keys "$key" ||
 	gpg --keyserver hkp://ipv4.pool.sks-keyservers.net --recv-keys "$key" ||
diff --git a/.versions b/.versions
index 425e6d7..ed277d0 100755
--- a/.versions
+++ b/.versions
@@ -3,6 +3,7 @@
 export NEOVIM_VERSION=0.3.1
 
 export GOLANG_VERSION=1.11
+export GOLANG_HASH=afc1e12f5fe49a471e3aae7d906c73e9d5b1fdd36d52d72652dde8f6250152fb
 
 export NODE_VERSION=10.11.0
 export YARN_VERSION=1.9.4