Merge pull request #17 from azohra/bugs/file-exist-check

Added check on file flag for files that do not exist
azohra · Feb 24, 2022 · 60e1e4a · 60e1e4a
2 parents f6ebd00 + f25e8f3
commit 60e1e4a
Show file tree

Hide file tree

Showing 4 changed files with 15 additions and 2 deletions.
diff --git a/src/ysh.sh b/src/ysh.sh
@@ -98,6 +98,10 @@ ysh() {
         exit 0
     ;;
     -f|--file)
+        if [ ! -f "${2}" ]; then
+            echo "Error: file ${2} does not exist" > /dev/stderr
+            exit 1
+        fi
         YSH_RAW_STRING="$(YSH_parse "${2}")"
         shift; shift
     ;;
@@ -154,7 +158,7 @@ ysh() {
             exit 1
         ;;
         *)
-            echo "Error: invalid use" > /dev/stdout
+            echo "Error: invalid use" > /dev/stderr
             exit 1
         ;;
         esac

diff --git a/test/shunit2 b/test/shunit2
diff --git a/test/test.sh b/test/test.sh
@@ -188,4 +188,9 @@ testHelpFlagShouldNotBeAnError() {
     assertEquals 0 $?
 }
 
+testFileDoesNotExist() {
+    result=$(ysh -f "does_not_exist.yaml" -s "doesnotmatter")
+    assertEquals 1 $?
+}
+
 . ./test/shunit2
diff --git a/ysh b/ysh
@@ -98,6 +98,10 @@ ysh() {
         exit 0
     ;;
     -f|--file)
+        if [ ! -f "${2}" ]; then
+            echo "Error: file ${2} does not exist" > /dev/stderr
+            exit 1
+        fi
         YSH_RAW_STRING="$(YSH_parse "${2}")"
         shift; shift
     ;;
@@ -154,7 +158,7 @@ ysh() {
             exit 1
         ;;
         *)
-            echo "Error: invalid use" > /dev/stdout
+            echo "Error: invalid use" > /dev/stderr
             exit 1
         ;;
         esac