From 469bd7c81c2e839826eaa99e30692342097f27ae Mon Sep 17 00:00:00 2001
From: Joshua Bussdieker <josh.bussdieker@moovweb.com>
Date: Tue, 20 Mar 2012 05:36:27 -0700
Subject: [PATCH] Cleanup system package install

---
 scripts/install | 15 +++------------
 1 file changed, 3 insertions(+), 12 deletions(-)

diff --git a/scripts/install b/scripts/install
index 31524a3..a1d5c4a 100755
--- a/scripts/install
+++ b/scripts/install
@@ -114,20 +114,11 @@ install_go() {
 
 install_gpkg() {
 	display_message " * Installing gpkg..."
-	$GVM_GOINSTALL github.com/moovweb/gpkg > $GVM_ROOT/logs/$version-gpkg.log 2>&1
-	if [[ $? -ne 0 ]]; then
-		display_warning "Failed to install gpkg"
-		return 1
-	fi
 }
 
 install_gb() {
 	display_message " * Installing gb..."
-	$GVM_GOINSTALL github.com/jbussdieker/go-gb/gb > $GVM_ROOT/logs/$version-gb.log 2>&1
-	if [[ $? -ne 0 ]]; then
-		display_warning "Failed to install gb"
-		return 1
-	fi
+	$GVM_GOINSTALL github.com/jbussdieker/go-gb/gb > $GVM_ROOT/logs/$version-gb.log 2>&1 || return 1
 }
 
 install_goprotobuf() {
@@ -160,8 +151,8 @@ main() {
 		GVM_GOINSTALL="go get"
 	x="`hg tags -R ~/.gvm/archive/go`"; echo ${x#*b0819469a6df} | grep "$version " &> /dev/null
 	if [[ "$?" == "1" ]]; then
-		install_gpkg
-		install_gb
+		install_gb || display_warning "Failed to install gb"
+		install_gpkg || display_warning "Failed to install gpkg"
 		if [ "$INSTALL_PB" == "true" ]; then
 			install_goprotobuf
 		fi