Skip to content

Commit f4a7fea

Browse files
mirkobrombinmirkobrombin
committed
fix:[close #268]: Missing new line in some outputs
1 parent 561648c commit f4a7fea

File tree

5 files changed

+39
-39
lines changed

5 files changed

+39
-39
lines changed

‎cmd/pkgManagers.go

+5-5
Original file line numberDiff line numberDiff line change
@@ -215,7 +215,7 @@ func listPkgManagers(cmd *cobra.Command, args []string) error {
215215
return nil
216216
}
217217

218-
fmt.Printf(apx.Trans("pkgmanagers.list.info.foundPkgManagers"), pkgManagersCount)
218+
cmdr.Info.Printfln(apx.Trans("pkgmanagers.list.info.foundPkgManagers"), pkgManagersCount)
219219

220220
table := core.CreateApxTable(os.Stdout)
221221
table.SetHeader([]string{apx.Trans("pkgmanagers.labels.name"), apx.Trans("pkgmanagers.labels.builtIn")})
@@ -338,7 +338,7 @@ func newPkgManager(cmd *cobra.Command, args []string) error {
338338
return nil
339339
}
340340

341-
cmdr.Info.Printf(apx.Trans("pkgmanagers.new.info.askCommand"), cmdName)
341+
cmdr.Info.Printfln(apx.Trans("pkgmanagers.new.info.askCommand"), cmdName)
342342
*cmd, _ = reader.ReadString('\n')
343343
*cmd = strings.ReplaceAll(*cmd, "\n", "")
344344
if *cmd == "" {
@@ -354,7 +354,7 @@ func newPkgManager(cmd *cobra.Command, args []string) error {
354354
return nil
355355
}
356356

357-
cmdr.Info.Printf(apx.Trans("pkgmanagers.new.info.askOverwrite"), name)
357+
cmdr.Info.Printfln(apx.Trans("pkgmanagers.new.info.askOverwrite"), name)
358358
answer, _ := reader.ReadString('\n')
359359
answer = strings.ReplaceAll(answer, "\n", "")
360360

@@ -371,7 +371,7 @@ func newPkgManager(cmd *cobra.Command, args []string) error {
371371
return nil
372372
}
373373

374-
cmdr.Success.Printf(apx.Trans("pkgmanagers.new.success"), name)
374+
cmdr.Success.Printfln(apx.Trans("pkgmanagers.new.success"), name)
375375

376376
return nil
377377
}
@@ -410,7 +410,7 @@ func rmPkgManager(cmd *cobra.Command, args []string) error {
410410
reader := bufio.NewReader(os.Stdin)
411411
validChoice := false
412412
for !validChoice {
413-
cmdr.Info.Printf(apx.Trans("pkgmanagers.rm.info.askConfirmation") + ` [y/N]`, pkgManagerName)
413+
cmdr.Info.Printfln(apx.Trans("pkgmanagers.rm.info.askConfirmation")+` [y/N]`, pkgManagerName)
414414
answer, _ := reader.ReadString('\n')
415415
if answer == "\n" {
416416
answer = "n\n"

‎cmd/runtime.go

+6-6
Original file line numberDiff line numberDiff line change
@@ -245,7 +245,7 @@ func runPkgCmd(subSystem *core.SubSystem, command string, cmd *cobra.Command, ar
245245
if command == "remove" {
246246
exportedN, err := subSystem.UnexportDesktopEntries(args...)
247247
if err == nil {
248-
cmdr.Info.Printf(apx.Trans("runtimeCommand.info.unexportedApps"), exportedN)
248+
cmdr.Info.Printfln(apx.Trans("runtimeCommand.info.unexportedApps"), exportedN)
249249
}
250250
}
251251

@@ -258,7 +258,7 @@ func runPkgCmd(subSystem *core.SubSystem, command string, cmd *cobra.Command, ar
258258
if command == "install" && !cmd.Flag("no-export").Changed {
259259
exportedN, err := subSystem.ExportDesktopEntries(args...)
260260
if err == nil {
261-
cmdr.Info.Printf(apx.Trans("runtimeCommand.info.exportedApps"), exportedN)
261+
cmdr.Info.Printfln(apx.Trans("runtimeCommand.info.exportedApps"), exportedN)
262262
}
263263
}
264264

@@ -303,14 +303,14 @@ func runPkgCmd(subSystem *core.SubSystem, command string, cmd *cobra.Command, ar
303303
return fmt.Errorf(apx.Trans("runtimeCommand.error.exportingApp"), err)
304304
}
305305

306-
cmdr.Info.Printf(apx.Trans("runtimeCommand.info.exportedApp"), appName)
306+
cmdr.Info.Printfln(apx.Trans("runtimeCommand.info.exportedApp"), appName)
307307
} else {
308308
err := subSystem.ExportBin(bin, binOutput)
309309
if err != nil {
310310
return fmt.Errorf(apx.Trans("runtimeCommand.error.exportingBin"), err)
311311
}
312312

313-
cmdr.Info.Printf(apx.Trans("runtimeCommand.info.exportedBin"), bin)
313+
cmdr.Info.Printfln(apx.Trans("runtimeCommand.info.exportedBin"), bin)
314314
}
315315
} else {
316316
if appName != "" {
@@ -319,14 +319,14 @@ func runPkgCmd(subSystem *core.SubSystem, command string, cmd *cobra.Command, ar
319319
return fmt.Errorf(apx.Trans("runtimeCommand.error.unexportingApp"), err)
320320
}
321321

322-
cmdr.Info.Printf(apx.Trans("runtimeCommand.info.unexportedApp"), appName)
322+
cmdr.Info.Printfln(apx.Trans("runtimeCommand.info.unexportedApp"), appName)
323323
} else {
324324
err := subSystem.UnexportBin(bin, binOutput)
325325
if err != nil {
326326
return fmt.Errorf(apx.Trans("runtimeCommand.error.unexportingBin"), err)
327327
}
328328

329-
cmdr.Info.Printf(apx.Trans("runtimeCommand.info.unexportedBin"), bin)
329+
cmdr.Info.Printfln(apx.Trans("runtimeCommand.info.unexportedBin"), bin)
330330
}
331331
}
332332
}

‎cmd/stacks.go

+6-6
Original file line numberDiff line numberDiff line change
@@ -335,7 +335,7 @@ func newStack(cmd *cobra.Command, args []string) error {
335335
for i, manager := range pkgManagers {
336336
fmt.Printf("%d. %s\n", i+1, manager.Name)
337337
}
338-
fmt.Printf(apx.Trans("stacks.new.info.selectPkgManager"), len(pkgManagers))
338+
cmdr.Info.Printfln(apx.Trans("stacks.new.info.selectPkgManager"), len(pkgManagers))
339339
var pkgManagerIndex int
340340
_, err := fmt.Scanln(&pkgManagerIndex)
341341
if err != nil {
@@ -380,7 +380,7 @@ func newStack(cmd *cobra.Command, args []string) error {
380380
return err
381381
}
382382

383-
cmdr.Info.Printfln(apx.Trans("stacks.new.info.success"), name)
383+
cmdr.Success.Printfln(apx.Trans("stacks.new.info.success"), name)
384384

385385
return nil
386386
}
@@ -409,7 +409,7 @@ func updateStack(cmd *cobra.Command, args []string) error {
409409

410410
if base == "" {
411411
if !assumeYes {
412-
cmdr.Info.Printf(apx.Trans("stacks.update.info.askBase"), stack.Base)
412+
cmdr.Info.Printfln(apx.Trans("stacks.update.info.askBase"), stack.Base)
413413
fmt.Scanln(&base)
414414
if base == "" {
415415
base = stack.Base
@@ -422,7 +422,7 @@ func updateStack(cmd *cobra.Command, args []string) error {
422422

423423
if pkgManager == "" {
424424
if !assumeYes {
425-
cmdr.Info.Printf(apx.Trans("stacks.update.info.askPkgManager"), stack.PkgManager)
425+
cmdr.Info.Printfln(apx.Trans("stacks.update.info.askPkgManager"), stack.PkgManager)
426426
fmt.Scanln(&pkgManager)
427427
if pkgManager == "" {
428428
pkgManager = stack.PkgManager
@@ -492,7 +492,7 @@ func removeStack(cmd *cobra.Command, args []string) error {
492492
reader := bufio.NewReader(os.Stdin)
493493
validChoice := false
494494
for !validChoice {
495-
cmdr.Info.Printf(apx.Trans("stacks.rm.info.askConfirmation") + ` [y/N]`, stackName)
495+
cmdr.Info.Printfln(apx.Trans("stacks.rm.info.askConfirmation")+` [y/N]`, stackName)
496496
answer, _ := reader.ReadString('\n')
497497
if answer == "\n" {
498498
answer = "n\n"
@@ -552,7 +552,7 @@ func exportStack(cmd *cobra.Command, args []string) error {
552552
return error
553553
}
554554

555-
cmdr.Info.Printf(apx.Trans("stacks.export.info.success"), stack.Name, output)
555+
cmdr.Info.Printfln(apx.Trans("stacks.export.info.success"), stack.Name, output)
556556
return nil
557557
}
558558

‎cmd/subsyStems.go

+8-8
Original file line numberDiff line numberDiff line change
@@ -145,7 +145,7 @@ func listSubSystems(cmd *cobra.Command, args []string) error {
145145
return nil
146146
}
147147

148-
fmt.Printf(apx.Trans("subsystems.list.info.foundSubsystems"), subSystemsCount)
148+
cmdr.Info.Printfln(apx.Trans("subsystems.list.info.foundSubsystems"), subSystemsCount)
149149

150150
table := core.CreateApxTable(os.Stdout)
151151
table.SetHeader([]string{apx.Trans("subsystems.labels.name"), "Stack", apx.Trans("subsystems.labels.status"), "Pkgs"})
@@ -196,7 +196,7 @@ func newSubSystem(cmd *cobra.Command, args []string) error {
196196
for i, stack := range stacks {
197197
fmt.Printf("%d. %s\n", i+1, stack.Name)
198198
}
199-
fmt.Printf(apx.Trans("subsystems.new.info.selectStack"), len(stacks))
199+
cmdr.Info.Printfln(apx.Trans("subsystems.new.info.selectStack"), len(stacks))
200200

201201
var stackIndex int
202202
_, err := fmt.Scanln(&stackIndex)
@@ -229,13 +229,13 @@ func newSubSystem(cmd *cobra.Command, args []string) error {
229229
return err
230230
}
231231

232-
cmdr.Info.Printf(apx.Trans("subsystems.new.info.creatingSubsystem"), subSystemName, stackName)
232+
cmdr.Info.Printfln(apx.Trans("subsystems.new.info.creatingSubsystem"), subSystemName, stackName)
233233
err = subSystem.Create()
234234
if err != nil {
235235
return err
236236
}
237237

238-
cmdr.Success.Printf(apx.Trans("subsystems.new.info.success"), subSystemName)
238+
cmdr.Success.Printfln(apx.Trans("subsystems.new.info.success"), subSystemName)
239239

240240
return nil
241241
}
@@ -250,7 +250,7 @@ func rmSubSystem(cmd *cobra.Command, args []string) error {
250250
}
251251

252252
if !forceFlag {
253-
cmdr.Info.Printf(apx.Trans("subsystems.rm.info.askConfirmation"), subSystemName)
253+
cmdr.Info.Printfln(apx.Trans("subsystems.rm.info.askConfirmation"), subSystemName)
254254
var confirmation string
255255
fmt.Scanln(&confirmation)
256256
if strings.ToLower(confirmation) != "y" {
@@ -269,7 +269,7 @@ func rmSubSystem(cmd *cobra.Command, args []string) error {
269269
return err
270270
}
271271

272-
cmdr.Success.Printf(apx.Trans("subsystems.rm.info.success"), subSystemName)
272+
cmdr.Success.Printfln(apx.Trans("subsystems.rm.info.success"), subSystemName)
273273

274274
return nil
275275
}
@@ -284,7 +284,7 @@ func resetSubSystem(cmd *cobra.Command, args []string) error {
284284
forceFlag, _ := cmd.Flags().GetBool("force")
285285

286286
if !forceFlag {
287-
cmdr.Info.Printf(apx.Trans("subsystems.reset.info.askConfirmation"), subSystemName)
287+
cmdr.Info.Printfln(apx.Trans("subsystems.reset.info.askConfirmation"), subSystemName)
288288
var confirmation string
289289
fmt.Scanln(&confirmation)
290290
if strings.ToLower(confirmation) != "y" {
@@ -303,7 +303,7 @@ func resetSubSystem(cmd *cobra.Command, args []string) error {
303303
return err
304304
}
305305

306-
cmdr.Success.Printf(apx.Trans("subsystems.reset.info.success"), subSystemName)
306+
cmdr.Success.Printfln(apx.Trans("subsystems.reset.info.success"), subSystemName)
307307

308308
return nil
309309
}

‎locales/en.yml

+14-14
Original file line numberDiff line numberDiff line change
@@ -26,12 +26,12 @@ runtimeCommand:
2626
unexportingApp: "An error occurred while unexporting the application: %s"
2727
unexportingBin: "An error occurred while unexporting the binary: %s"
2828
info:
29-
unexportedApps: "Unexported %d applications\n"
30-
exportedApps: "Exported %d applications\n"
31-
exportedApp: "Exported application %s\n"
32-
exportedBin: "Exported binary %s\n"
33-
unexportedApp: "Unexported application %s\n"
34-
unexportedBin: "Unexported binary %s\n"
29+
unexportedApps: "Unexported %d applications"
30+
exportedApps: "Exported %d applications"
31+
exportedApp: "Exported application %s"
32+
exportedBin: "Exported binary %s"
33+
unexportedApp: "Unexported application %s"
34+
unexportedBin: "Unexported binary %s"
3535
autoremove:
3636
description: "Remove packages that are no longer required."
3737
clean:
@@ -87,7 +87,7 @@ pkgmanagers:
8787
info:
8888
noPkgManagers: "No package managers available. Create a new one with 'apx pkgmanagers
8989
new' or contact the system administrator."
90-
foundPkgManagers: "Found %d package managers:\n"
90+
foundPkgManagers: "Found %d package managers"
9191
options:
9292
json:
9393
description: "Output in JSON format."
@@ -141,9 +141,9 @@ pkgmanagers:
141141

142142
error:
143143
noName: "No name specified."
144-
inUse: "The package manager is used in %d stacks:\n"
144+
inUse: "The package manager is used in %d stacks:"
145145
info:
146-
askConfirmation: "Are you sure you want to remove '%s'?"
146+
askConfirmation: "Are you sure you want to remove '%s'? [y/N]"
147147
success: "Removed package manager '%s'."
148148
aborting: "Aborting removal of package manager '%s'."
149149
options:
@@ -163,7 +163,7 @@ stacks:
163163
info:
164164
noStacks: "No stacks available. Create a new one with 'apx stacks new' or contact
165165
the system administrator."
166-
foundStacks: "Found %d stacks:\n"
166+
foundStacks: "Found %d stacks:"
167167
aborting: "Aborting removal of stack '%s'."
168168
options:
169169
json:
@@ -237,7 +237,7 @@ stacks:
237237
error:
238238
noName: "No name specified."
239239
info:
240-
askConfirmation: "Are you sure you want to remove '%s'?"
240+
askConfirmation: "Are you sure you want to remove '%s'? [y/N]"
241241
success: "Removed stack '%s'."
242242
options:
243243
force:
@@ -279,7 +279,7 @@ subsystems:
279279
info:
280280
noSubsystems: "No subsystems available. Create a new one with 'apx subsystems
281281
new' or contact the system administrator."
282-
foundSubsystems: "Found %d subsystems:\n"
282+
foundSubsystems: "Found %d subsystems:"
283283
options:
284284
json:
285285
description: "Output in JSON format."
@@ -310,7 +310,7 @@ subsystems:
310310
error:
311311
noName: "No name specified."
312312
info:
313-
askConfirmation: "Are you sure you want to remove '%s'?"
313+
askConfirmation: "Are you sure you want to remove '%s'? [y/N]"
314314
success: "Removed subsystem '%s'."
315315
options:
316316
force:
@@ -322,7 +322,7 @@ subsystems:
322322
error:
323323
noName: "No name specified."
324324
info:
325-
askConfirmation: "Are you sure you want to reset '%s'?"
325+
askConfirmation: "Are you sure you want to reset '%s'? [y/N]"
326326
success: "The subsystem '%s' has been reset."
327327
options:
328328
force:

0 commit comments

Comments
 (0)