Updates/adjustments

1 files changed, 14 insertions, 22 deletions

diff --git a/ves-delete.sh b/ves-delete.sh
index d7e6fc6..6d1557b 100644
--- a/ves-delete.sh
+++ b/ves-delete.sh
@@ -1,29 +1,21 @@
 #!/bin/sh
-
-OVERRIDE_VARS="PATH LDPATH"
-
-if [ -z $XDG_DATA_HOME ]; then
-    ENV_DIR="$HOME/.local/share/ves/envs"
-else
-    ENV_DIR="$XDG_DATA_HOME/ves/envs"
-fi
-
-check_name() {
-    if [ ! -f "$ENV_DIR/$1" ]; then
-        printf "ERROR: Environment [%s] does not exist.\n" $1 > /dev/stderr
-        exit 1
+ves_delete() {
+    if [ "$#" -lt 1 ]; then
+        printf "ERROR: No environment name specified.\n" > /dev/stderr
+        return 1
     fi
 
-    if ! echo $1 | grep "^[[:alpha:][:digit:]_-]*$" > /dev/null; then
-        printf "ERROR: Environment [%s] is invalid. Name must contain only letters, -, and _\n" $1 > /dev/stderr
-        exit 1
+    env_name="$1"
+    if ! _shves_check_env_name "$env_name"; then
+        return 1
     fi
-}
 
+    if ! _shves_check_env_exists "$env_name"; then
+        return 1;
+    fi
 
-ENV_NAME="$1"
-
-check_name "$1"
-rm -f "$ENV_DIR/$ENV_NAME"
+    rm -f "$SHVES_ENV_DIR/$env_name"
+    printf "Environment [%s] deleted successfully\n" $env_name
 
-printf "Environment [%s] deleted successfully\n" $ENV_NAME
+    return 0
+}