Skip to content

Commit 00a81bc

Browse files
committed
oops x2
1 parent 2047477 commit 00a81bc

File tree

1 file changed

+21
-21
lines changed

1 file changed

+21
-21
lines changed

lib/project.ab

Lines changed: 21 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
1-
import { dir_create, dir_exists, file_glob, file_write, file_exists, file_read } from "std/fs"
2-
import { input_confirm, env_var_get, env_var_test } from "std/env"
1+
import { temp_dir_create, dir_create, dir_exists, file_glob, file_write, file_exists, file_read } from "std/fs"
2+
import { input_confirm, env_var_set, env_var_get, env_var_test } from "std/env"
33
import { starts_with, ends_with, split, split_lines, join, trim, replace } from "std/text"
44
import { array_pop } from "std/array"
55

@@ -30,25 +30,6 @@ pub fun locate_project(): [Text] {
3030
return ["no", ""]
3131
}
3232

33-
pub fun require_project(): Text {
34-
const result = locate_project()
35-
if result[0] == "no" {
36-
fatal("Failed to locate an 'amethyst.ini' file, make sure you are in a project's (sub)directory.")
37-
}
38-
39-
if not env_var_test("AM_INI_DIR") {
40-
const tmp_dir = temp_dir_create("amethyst.XXXXXXXXXX", true, true) failed {
41-
fatal("Failed to create tmp dir")
42-
}
43-
env_var_set("AM_INI_DIR", tmp_dir) failed {
44-
fatal("Failed to set env var")
45-
}
46-
open_ini("{result[1]}/amethyst.ini")
47-
}
48-
49-
return result[1]
50-
}
51-
5233
pub fun open_ini(ini_file: Text) {
5334
const tmp_dir = trust env_var_get("AM_INI_DIR")
5435

@@ -84,6 +65,25 @@ pub fun open_ini(ini_file: Text) {
8465
}
8566
}
8667

68+
pub fun require_project(): Text {
69+
const result = locate_project()
70+
if result[0] == "no" {
71+
fatal("Failed to locate an 'amethyst.ini' file, make sure you are in a project's (sub)directory.")
72+
}
73+
74+
if not env_var_test("AM_INI_DIR") {
75+
const tmp_dir = temp_dir_create("amethyst.XXXXXXXXXX", true, true) failed {
76+
fatal("Failed to create tmp dir")
77+
}
78+
env_var_set("AM_INI_DIR", tmp_dir) failed {
79+
fatal("Failed to set env var")
80+
}
81+
open_ini("{result[1]}/amethyst.ini")
82+
}
83+
84+
return result[1]
85+
}
86+
8787
pub fun close_ini(ini_file: Text) {
8888
const tmp_dir = trust env_var_get("AM_INI_DIR")
8989
let buffer = ""

0 commit comments

Comments
 (0)