Fix up scripts

lumaxis · Nov 2, 2017 · 2ad6c9e · 2ad6c9e
1 parent 6b06012
commit 2ad6c9e
Show file tree

Hide file tree

Showing 5 changed files with 26 additions and 20 deletions.
diff --git a/bin/is-executable b/bin/is-executable
@@ -1,3 +1,5 @@
+#!/usr/bin/env bash
+
 if type "$1" >/dev/null 2>&1; then
   exit 0
 else

diff --git a/bin/is-macos b/bin/is-macos
@@ -1,3 +1,5 @@
+#!/usr/bin/env bash
+
 if [[ "$OSTYPE" =~ ^darwin ]]; then
   exit 0
 else

diff --git a/bin/is-supported b/bin/is-supported
@@ -1,3 +1,5 @@
+#!/usr/bin/env bash
+
 if [ $# -eq 1 ]; then
   if eval "$1" > /dev/null 2>&1; then 
     exit 0

diff --git a/test/bin.bats b/test/bin.bats
@@ -11,6 +11,26 @@
 	[ "$ACTUAL" = "$EXPECTED" ]
 }
 
+@test "is-executable" {
+	run is-executable ls
+	[ "$status" -eq 0 ]
+}
+
+@test "is-executable (false)" {
+	run is-executable nonexistent
+	[ "$status" -eq 1 ]
+}
+
+@test "is-supported" {
+	run is-supported ls -a
+	[ "$status" -eq 0 ]
+}
+
+@test "is-supported (false)" {
+	run is-supported "ls --nonexistent"
+	[ "$status" -eq 1 ]
+}
+
 @test "set-config" {
 	run set-config KEY_A VALUE_1 MYFILE
 	run set-config KEY_B VALUE_2 MYFILE

diff --git a/test/function.bats b/test/function.bats
@@ -12,26 +12,6 @@ FIXTURE_TEXT="foo"
 	[ "$ACTUAL" = "$EXPECTED" ]
 }
 
-@test "is-executable" {
-	run is-executable ls
-	[ "$status" -eq 0 ]
-}
-
-@test "is-executable (false)" {
-	run is-executable nonexistent
-	[ "$status" -eq 1 ]
-}
-
-@test "is-supported" {
-	run is-supported ls -a
-	[ "$status" -eq 0 ]
-}
-
-@test "is-supported (false)" {
-	run is-supported "ls --nonexistent"
-	[ "$status" -eq 1 ]
-}
-
 @test "calc" {
 	ACTUAL="$(calc 1+2)"
 	EXPECTED=3