Skip to content

Commit 4fe510c

Browse files
LexLuthrLexLuthr
committed
fix outputs
1 parent f8dc1f8 commit 4fe510c

File tree

9 files changed

+615
-678
lines changed

9 files changed

+615
-678
lines changed

‎apt/make_debs.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -111,7 +111,7 @@ func part2(base, product, extra string) {
111111
OrPanic(os.MkdirAll(base, 0755))
112112
OrPanic(copyFile("curio", path.Join(base, "curio")))
113113
OrPanic(copyFile("sptool", path.Join(base, "sptool")))
114-
base = path.Join(dir, "lib", "systemd", "system")
114+
base = path.Join(dir, "etc", "systemd", "system")
115115
OrPanic(os.MkdirAll(base, 0755))
116116
OrPanic(copyFile("apt/curio.service", path.Join(base, "curio.service")))
117117
base = path.Join(dir, "usr", "share", "bash-completion", "completions")

‎cmd/curio/guidedsetup/guidedsetup.go

+10-68
Original file line numberDiff line numberDiff line change
@@ -284,74 +284,16 @@ func afterRan(d *MigrationData) {
284284
}
285285
rcFilePath := filepath.Join(usr.HomeDir, rcFile)
286286

287-
// Read the existing rc file content
288-
file, err := os.OpenFile(rcFilePath, os.O_RDWR|os.O_CREATE, 0644)
289-
if err != nil {
290-
d.say(notice, "Error opening %s file: %s", rcFile, err)
291-
os.Exit(1)
292-
}
293-
294-
// Variables to be added or updated
295-
exportLines := map[string]string{
296-
"CURIO_DB_HOST": fmt.Sprintf("export CURIO_DB_HOST=%s", strings.Join(d.HarmonyCfg.Hosts, ",")),
297-
"CURIO_DB_PORT": fmt.Sprintf("export CURIO_DB_PORT=%s", d.HarmonyCfg.Port),
298-
"CURIO_DB_NAME": fmt.Sprintf("export CURIO_DB_HOST=%s", d.HarmonyCfg.Database),
299-
"CURIO_DB_USER": fmt.Sprintf("export CURIO_DB_HOST=%s", d.HarmonyCfg.Username),
300-
"CURIO_DB_PASSWORD": fmt.Sprintf("export CURIO_DB_HOST=%s", d.HarmonyCfg.Password),
301-
}
302-
303-
// Flags to track whether we need to append these lines
304-
existingVars := map[string]bool{
305-
"CURIO_DB_HOST": false,
306-
"CURIO_DB_PORT": false,
307-
"CURIO_DB_NAME": false,
308-
"CURIO_DB_USER": false,
309-
"CURIO_DB_PASSWORD": false,
310-
}
311-
312-
var lines []string
313-
scanner := bufio.NewScanner(file)
314-
315-
for scanner.Scan() {
316-
line := scanner.Text()
317-
modified := false
318-
319-
// Check each export line to see if it exists and is not commented out
320-
for key, newValue := range exportLines {
321-
if strings.HasPrefix(line, "export "+key+"=") && !strings.HasPrefix(strings.TrimSpace(line), "#") {
322-
lines = append(lines, newValue)
323-
existingVars[key] = true
324-
modified = true
325-
break
326-
}
327-
}
328-
329-
// If no modifications were made, retain the original line
330-
if !modified {
331-
lines = append(lines, line)
332-
}
333-
}
334-
335-
if err := scanner.Err(); err != nil {
336-
d.say(notice, "Error reading %s file: %s", rcFile, err)
337-
os.Exit(1)
338-
}
339-
340-
// Append missing export lines
341-
for key, added := range existingVars {
342-
if !added {
343-
lines = append(lines, exportLines[key])
344-
}
345-
}
346-
347-
err = file.Close()
348-
if err != nil {
349-
d.say(notice, "Error closing %s file: %s", rcFile, err)
350-
os.Exit(1)
287+
lines := []string{
288+
fmt.Sprintf("export CURIO_DB_HOST=%s", strings.Join(d.HarmonyCfg.Hosts, ",")),
289+
fmt.Sprintf("export CURIO_DB_USER=%s", d.HarmonyCfg.Username),
290+
fmt.Sprintf("export CURIO_DB_PASSWORD=%s", d.HarmonyCfg.Password),
291+
fmt.Sprintf("export CURIO_DB_PORT=%s", d.HarmonyCfg.Port),
292+
fmt.Sprintf("export CURIO_DB_NAME=%s", d.HarmonyCfg.Database),
351293
}
352294

353295
// Reopen the file in write mode to overwrite with updated content
354-
file, err = os.OpenFile(rcFilePath, os.O_WRONLY|os.O_APPEND, 0644)
296+
file, err := os.OpenFile(rcFilePath, os.O_WRONLY|os.O_APPEND, 0644)
355297
if err != nil {
356298
d.say(notice, "Error opening %s file in write mode:", rcFile, err)
357299
return
@@ -372,12 +314,12 @@ func afterRan(d *MigrationData) {
372314
for i := 1; i < 6; i++ {
373315
err := writer.Flush()
374316
if err != nil {
375-
d.say(notice, "Failed to flush thw writes to file %s: %s", rcFile, err)
317+
d.say(notice, "Failed to flush the writes to file %s: %s", rcFile, err)
376318
d.say(notice, "Retrying.......(%d/5)", i)
377319
continue
378320
}
379-
d.say(notice, "Failed to flush thw writes to file %s: %s", rcFile, err)
380-
os.Exit(1)
321+
d.say(notice, "Finished updating the %s file", rcFile)
322+
break
381323
}
382324
}
383325

‎cmd/curio/guidedsetup/servicesetup.go

+28-37
Original file line numberDiff line numberDiff line change
@@ -119,20 +119,20 @@ func createEnvFile(d *MigrationData) {
119119
// Define the path to the environment file
120120
envFilePath := "/etc/curio.env"
121121

122-
var layers []string
123-
var repoPath, nodeName string
122+
var layers, additionalEnvVars, envVars []string
124123

125-
envVars := map[string]string{}
124+
repoPath := "~/.curio"
125+
nodeName := "ChangeME"
126126

127127
// Take user input to remaining env vars
128128
for {
129129
i, _, err := (&promptui.Select{
130130
Label: d.T("Enter the info to configure your Curio node"),
131131
Items: []string{
132-
d.T("CURIO_LAYERS: %s", ""),
133-
d.T("CURIO_REPO_PATH: %s", "~/.curio"),
134-
d.T("CURIO_NODE_NAME: %s", ""),
135-
d.T("Add additional variables like FIL_PROOFS_PARAMETER_CACHE."),
132+
d.T("CURIO_LAYERS: %s", layers),
133+
d.T("CURIO_REPO_PATH: %s", repoPath),
134+
d.T("CURIO_NODE_NAME: %s", nodeName),
135+
d.T("Add additional variables like FIL_PROOFS_PARAMETER_CACHE: %s", envVars),
136136
d.T("Continue update the env file.")},
137137
Size: 6,
138138
Templates: d.selectTemplates,
@@ -189,7 +189,6 @@ func createEnvFile(d *MigrationData) {
189189
d.say(plain, "Start typing your additional environment variables one variable per line. Use Ctrl+D to finish:")
190190
reader := bufio.NewReader(os.Stdin)
191191

192-
var additionalEnvVars []string
193192
for {
194193
text, err := reader.ReadString('\n')
195194
if err != nil {
@@ -205,47 +204,39 @@ func createEnvFile(d *MigrationData) {
205204
for _, envVar := range additionalEnvVars {
206205
parts := strings.SplitN(envVar, "=", 2)
207206
if len(parts) == 2 {
208-
envVars[strings.TrimSpace(parts[0])] = strings.TrimSpace(parts[1])
207+
envVars = append(envVars, fmt.Sprintf("%s=%s", strings.TrimSpace(parts[0]), strings.TrimSpace(parts[1])))
209208
} else {
210209
d.say(notice, "Skipping invalid input: %s", envVar)
211210
}
212211
}
213212
continue
214213
case 4:
215214
// Define the environment variables to be added or updated
216-
defenvVars := map[string]string{
217-
"CURIO_LAYERS": fmt.Sprintf("export CURIO_LAYERS=%s", strings.Join(layers, ",")),
218-
"CURIO_ALL_REMAINING_FIELDS_ARE_OPTIONAL": "true",
219-
"CURIO_DB_HOST": fmt.Sprintf("export CURIO_DB_HOST=%s", strings.Join(d.HarmonyCfg.Hosts, ",")),
220-
"CURIO_DB_PORT": fmt.Sprintf("export CURIO_DB_PORT=%s", d.HarmonyCfg.Port),
221-
"CURIO_DB_NAME": fmt.Sprintf("export CURIO_DB_HOST=%s", d.HarmonyCfg.Database),
222-
"CURIO_DB_USER": fmt.Sprintf("export CURIO_DB_HOST=%s", d.HarmonyCfg.Username),
223-
"CURIO_DB_PASSWORD": fmt.Sprintf("export CURIO_DB_HOST=%s", d.HarmonyCfg.Password),
224-
"CURIO_REPO_PATH": repoPath,
225-
"CURIO_NODE_NAME": nodeName,
226-
"FIL_PROOFS_USE_MULTICORE_SDR": "1",
215+
defenvVars := []string{
216+
fmt.Sprintf("CURIO_LAYERS=%s", strings.Join(layers, ",")),
217+
"CURIO_ALL_REMAINING_FIELDS_ARE_OPTIONAL=true",
218+
fmt.Sprintf("CURIO_DB_HOST=%s", strings.Join(d.HarmonyCfg.Hosts, ",")),
219+
fmt.Sprintf("CURIO_DB_USER=%s", d.HarmonyCfg.Username),
220+
fmt.Sprintf("CURIO_DB_PASSWORD=%s", d.HarmonyCfg.Password),
221+
fmt.Sprintf("CURIO_DB_PORT=%s", d.HarmonyCfg.Port),
222+
fmt.Sprintf("CURIO_DB_NAME=%s", d.HarmonyCfg.Database),
223+
fmt.Sprintf("CURIO_REPO_PATH=%s", repoPath),
224+
fmt.Sprintf("CURIO_NODE_NAME=%s", nodeName),
225+
"FIL_PROOFS_USE_MULTICORE_SDR=1",
227226
}
228-
for s, s2 := range defenvVars {
229-
envVars[s] = s2
227+
var w string
228+
for _, s := range defenvVars {
229+
w += fmt.Sprintf("%s\n", s)
230230
}
231-
232-
// Open the file with truncation (this clears the file if it exists)
233-
file, err := os.OpenFile(envFilePath, os.O_WRONLY|os.O_TRUNC|os.O_CREATE, 0644)
234-
if err != nil {
235-
d.say(notice, "Error opening or creating file %s: %s", envFilePath, err)
236-
os.Exit(1)
231+
for _, s := range envVars {
232+
w += fmt.Sprintf("%s\n", s)
237233
}
238-
defer func(file *os.File) {
239-
_ = file.Close()
240-
}(file)
241234

242235
// Write the new environment variables to the file
243-
for key, value := range envVars {
244-
line := fmt.Sprintf("%s=%s\n", key, value)
245-
if _, err := file.WriteString(line); err != nil {
246-
d.say(notice, "Error writing to file %s: %s", envFilePath, err)
247-
os.Exit(1)
248-
}
236+
err = os.WriteFile(envFilePath, []byte(w), 0644)
237+
if err != nil {
238+
d.say(notice, "Error writing to file %s: %s", envFilePath, err)
239+
os.Exit(1)
249240
}
250241
d.say(notice, "Service env file /etc/curio.env created successfully.")
251242
return

0 commit comments

Comments
 (0)