|
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" |
3 | 3 | import { starts_with, ends_with, split, split_lines, join, trim, replace } from "std/text" |
4 | 4 | import { array_pop } from "std/array" |
5 | 5 |
|
@@ -30,25 +30,6 @@ pub fun locate_project(): [Text] { |
30 | 30 | return ["no", ""] |
31 | 31 | } |
32 | 32 |
|
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 | | - |
52 | 33 | pub fun open_ini(ini_file: Text) { |
53 | 34 | const tmp_dir = trust env_var_get("AM_INI_DIR") |
54 | 35 |
|
@@ -84,6 +65,25 @@ pub fun open_ini(ini_file: Text) { |
84 | 65 | } |
85 | 66 | } |
86 | 67 |
|
| 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 | + |
87 | 87 | pub fun close_ini(ini_file: Text) { |
88 | 88 | const tmp_dir = trust env_var_get("AM_INI_DIR") |
89 | 89 | let buffer = "" |
|
0 commit comments