Skip to content

Commit

Permalink
feat(review): moved shell to env
Browse files Browse the repository at this point in the history
  • Loading branch information
Mte90 committed Jul 10, 2024
1 parent af56251 commit 0d611e4
Show file tree
Hide file tree
Showing 10 changed files with 28 additions and 28 deletions.
20 changes: 20 additions & 0 deletions src/std/shell.ab → src/std/env.ab
Original file line number Diff line number Diff line change
@@ -1,3 +1,23 @@
import * from "std/fs"

pub fun get_env_var(var: Text): Text {
let _var = unsafe $echo "\$\{!var}"$
if _var != "" {
return _var
}

if file_exist(".env") {
unsafe $source ".env"$
return unsafe $echo "\$\{!var}"$
}

return ""
}

pub fun load_env_file(): Null {
unsafe $export "\$(xargs < .env)" > /dev/null$
}

pub fun shell_isset(name: Text): Bool {
$[[ ! -z \$\{!{nameof name}+z} ]]$ failed {
return false
Expand Down
20 changes: 0 additions & 20 deletions src/std/misc.ab

This file was deleted.

2 changes: 1 addition & 1 deletion src/tests/stdlib/get_env_var.ab
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import { get_env_var } from "std/misc"
import { get_env_var } from "std/env"
import { file_write } from "std/fs"
main {
let path = unsafe $mktemp -d /tmp/amber-XXXX$
Expand Down
2 changes: 1 addition & 1 deletion src/tests/stdlib/load_env_file.ab
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import { load_env_file, get_env_var } from "std/misc"
import { load_env_file, get_env_var } from "std/env"
import { file_write } from "std/fs"
main {
let path = unsafe $mktemp -d /tmp/amber-XXXX$
Expand Down
2 changes: 1 addition & 1 deletion src/tests/stdlib/shell_constant_get.ab
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import * from "std/shell"
import * from "std/env"
main {
unsafe shell_constant_set("test_shell_constant_get", "Hello Amber!")
unsafe $echo "\$test_shell_constant_get"$
Expand Down
2 changes: 1 addition & 1 deletion src/tests/stdlib/shell_constant_set.ab
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import * from "std/shell"
import * from "std/env"
main {
unsafe shell_constant_set("test_shell_constant_set", "Hello Amber")
let str = ""
Expand Down
2 changes: 1 addition & 1 deletion src/tests/stdlib/shell_isset.ab
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import * from "std/shell"
import * from "std/env"
main {
unsafe $test_var_isset="test"$
if shell_isset("test_var_isset") {
Expand Down
2 changes: 1 addition & 1 deletion src/tests/stdlib/shell_unset.ab
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import * from "std/shell"
import * from "std/env"
main {
unsafe shell_var_set("test_shell_unset", "Hello Amber!")
unsafe $echo \$test_shell_unset$
Expand Down
2 changes: 1 addition & 1 deletion src/tests/stdlib/shell_var_get.ab
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import * from "std/shell"
import * from "std/env"
main {
unsafe $export test_shell_var_get="Hello Amber!"$
echo unsafe shell_var_get("test_shell_var_get")
Expand Down
2 changes: 1 addition & 1 deletion src/tests/stdlib/shell_var_set.ab
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import * from "std/shell"
import * from "std/env"
main {
unsafe shell_var_set("test_shell_var_set", "Hello Amber!")
unsafe $echo \$test_shell_var_set$
Expand Down

0 comments on commit 0d611e4

Please sign in to comment.