From 5ef8b40fa8e75d6a88b0a98f4df39a171fbd2ebe Mon Sep 17 00:00:00 2001 From: Joshua Bussdieker Date: Sun, 4 Mar 2012 17:24:11 -0800 Subject: [PATCH] Better error handling in uninstall script --- scripts/uninstall | 17 ++++++++++------- 1 file changed, 10 insertions(+), 7 deletions(-) diff --git a/scripts/uninstall b/scripts/uninstall index c826059..ddb6439 100755 --- a/scripts/uninstall +++ b/scripts/uninstall @@ -8,12 +8,15 @@ fuzzy_match=`ls $GVM_ROOT/gos | sort | grep "$1" | head -n 1 | 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" + rm -rf $GVM_ROOT/pkgsets/$fuzzy_match &> /dev/null || + display_error "Couldn't remove pkgsets" + rm -f $GVM_ROOT/environments/$fuzzy_match &> /dev/null || + display_error "Couldn't remove environment files" + rm -f "$GVM_ROOT/environments/$fuzzy_match@"* &> /dev/null || + display_error "Couldn't remove pkgset environment files" + rm -rf $GVM_ROOT/gos/$fuzzy_match &> /dev/null || + display_error "Couldn't remove Go folder" + echo "Uninstalled version $fuzzy_match" else - display_error "Invalid version" + display_error "Invalid version" fi -