From fecfebf0111457dc3b809030921dccf49a54ac58 Mon Sep 17 00:00:00 2001
From: Joshua Bussdieker <josh.bussdieker@moovweb.com>
Date: Sat, 18 Feb 2012 15:11:33 -0800
Subject: [PATCH] Use the error function

---
 scripts/uninstall | 40 +++++++++++++++++++++-------------------
 1 file changed, 21 insertions(+), 19 deletions(-)

diff --git a/scripts/uninstall b/scripts/uninstall
index 30c7a63..0685833 100755
--- a/scripts/uninstall
+++ b/scripts/uninstall
@@ -1,23 +1,25 @@
 #!/bin/bash
-if [[ -n $1 ]]; then
-  fuzzy_match=`ls $GVM_ROOT/gos | grep "$1"`
-  if [[ $? != 0 ]]; then
-    echo "Invalid version $1"
-    exit 1
-  fi
-  if [ -d $GVM_ROOT/gos/$fuzzy_match ]; then
-    rm -rf $GVM_ROOT/gos/$fuzzy_match
-    rm -rf $GVM_ROOT/pkgsets/$fuzzy_match
-		rm -f $GVM_ROOT/environments/$fuzzy_match
-		rm -f "$GVM_ROOT/environments/$fuzzy_match@"*
-    echo "Uninstalled version $fuzzy_match"
-  else
-    echo "Invalid version"
-    exit 1
-  fi
-  exit 0
+display_error() {
+	tput sgr0
+	tput setaf 1
+	echo "ERROR: $1"
+	tput sgr0
+	exit 1
+}
+
+[[ "$1" == "" ]] && 
+	display_error "Please specifiy the version"
+
+fuzzy_match=`ls $GVM_ROOT/gos | grep "$1"` ||
+	display_error "Invalid version $1"
+
+if [ -d $GVM_ROOT/gos/$fuzzy_match ]; then
+  rm -rf $GVM_ROOT/gos/$fuzzy_match
+  rm -rf $GVM_ROOT/pkgsets/$fuzzy_match
+	rm -f $GVM_ROOT/environments/$fuzzy_match
+	rm -f "$GVM_ROOT/environments/$fuzzy_match@"*
+  echo "Uninstalled version $fuzzy_match"
 else
-  echo "ERROR: Please specifiy the version"
-  exit 1
+  display_error "Invalid version"
 fi