Skip to content

Commit c5caf50

Browse files
jardonjardon
committed
feat: change assume-yes wording to no-prompt
- change all occurances of assume-yes to no-prompt - change locales string name for prompt help - change wording of en noprompt string message
1 parent 3767a1a commit c5caf50

32 files changed

+125
-125
lines changed

‎cmd/pkgManagers.go

+20-20
Original file line numberDiff line numberDiff line change
@@ -66,9 +66,9 @@ func NewPkgManagersCommand() *cmdr.Command {
6666

6767
newCmd.WithBoolFlag(
6868
cmdr.NewBoolFlag(
69-
"assume-yes",
69+
"no-prompt",
7070
"y",
71-
apx.Trans("pkgmanagers.new.options.assumeYes.description"),
71+
apx.Trans("pkgmanagers.new.options.noPrompt.description"),
7272
false,
7373
),
7474
)
@@ -259,9 +259,9 @@ func NewPkgManagersCommand() *cmdr.Command {
259259
)
260260
updateCmd.WithBoolFlag(
261261
cmdr.NewBoolFlag(
262-
"assume-yes",
262+
"no-prompt",
263263
"y",
264-
apx.Trans("pkgmanagers.new.options.assumeYes.description"),
264+
apx.Trans("pkgmanagers.new.options.noPrompt.description"),
265265
false,
266266
),
267267
)
@@ -419,7 +419,7 @@ func showPkgManager(cmd *cobra.Command, args []string) error {
419419
}
420420

421421
func newPkgManager(cmd *cobra.Command, args []string) error {
422-
assumeYes, _ := cmd.Flags().GetBool("assume-yes")
422+
noPrompt, _ := cmd.Flags().GetBool("no-prompt")
423423
name, _ := cmd.Flags().GetString("name")
424424
needSudo, _ := cmd.Flags().GetBool("need-sudo")
425425
autoRemove, _ := cmd.Flags().GetString("autoremove")
@@ -436,7 +436,7 @@ func newPkgManager(cmd *cobra.Command, args []string) error {
436436
reader := bufio.NewReader(os.Stdin)
437437

438438
if name == "" {
439-
if assumeYes {
439+
if noPrompt {
440440
cmdr.Error.Println(apx.Trans("pkgmanagers.new.error.noName"))
441441
return nil
442442
}
@@ -451,7 +451,7 @@ func newPkgManager(cmd *cobra.Command, args []string) error {
451451
}
452452
}
453453

454-
if !needSudo && !assumeYes {
454+
if !needSudo && !noPrompt {
455455
validChoice := false
456456
for !validChoice {
457457
cmdr.Info.Println(apx.Trans("pkgmanagers.new.info.askSudo") + ` [y/N]`)
@@ -488,7 +488,7 @@ func newPkgManager(cmd *cobra.Command, args []string) error {
488488

489489
for cmdName, cmd := range cmdMap {
490490
if *cmd == "" {
491-
if assumeYes {
491+
if noPrompt {
492492
cmdr.Error.Printf(apx.Trans("pkgmanagers.new.error.noCommand"), cmdName)
493493
return nil
494494
}
@@ -504,7 +504,7 @@ func newPkgManager(cmd *cobra.Command, args []string) error {
504504
}
505505

506506
if core.PkgManagerExists(name) {
507-
if assumeYes {
507+
if noPrompt {
508508
cmdr.Error.Println(apx.Trans("pkgmanagers.new.error.alreadyExists"), name)
509509
return nil
510510
}
@@ -648,7 +648,7 @@ func importPkgmanager(cmd *cobra.Command, args []string) error {
648648
func updatePkgManager(cmd *cobra.Command, args []string) error {
649649
name, _ := cmd.Flags().GetString("name")
650650
needSudo, _ := cmd.Flags().GetBool("need-sudo")
651-
assumeYes, _ := cmd.Flags().GetBool("assume-yes")
651+
noPrompt, _ := cmd.Flags().GetBool("no-prompt")
652652
autoRemove, _ := cmd.Flags().GetString("autoremove")
653653
clean, _ := cmd.Flags().GetString("clean")
654654
install, _ := cmd.Flags().GetString("install")
@@ -683,7 +683,7 @@ func updatePkgManager(cmd *cobra.Command, args []string) error {
683683
reader := bufio.NewReader(os.Stdin)
684684

685685
if autoRemove == "" {
686-
if !assumeYes {
686+
if !noPrompt {
687687
cmdr.Info.Printfln(apx.Trans("pkgmanagers.update.info.askNewCommand"), "autoRemove", pkgmanager.CmdAutoRemove)
688688
answer, _ := reader.ReadString('\n')
689689
answer = strings.TrimSpace(answer)
@@ -699,7 +699,7 @@ func updatePkgManager(cmd *cobra.Command, args []string) error {
699699
}
700700

701701
if clean == "" {
702-
if !assumeYes {
702+
if !noPrompt {
703703
cmdr.Info.Printfln(apx.Trans("pkgmanagers.update.info.askNewCommand"), "clean", pkgmanager.CmdClean)
704704
answer, _ := reader.ReadString('\n')
705705
answer = strings.TrimSpace(answer)
@@ -715,7 +715,7 @@ func updatePkgManager(cmd *cobra.Command, args []string) error {
715715
}
716716

717717
if install == "" {
718-
if !assumeYes {
718+
if !noPrompt {
719719
cmdr.Info.Printfln(apx.Trans("pkgmanagers.update.info.askNewCommand"), "install", pkgmanager.CmdInstall)
720720
answer, _ := reader.ReadString('\n')
721721
answer = strings.TrimSpace(answer)
@@ -731,7 +731,7 @@ func updatePkgManager(cmd *cobra.Command, args []string) error {
731731
}
732732

733733
if list == "" {
734-
if !assumeYes {
734+
if !noPrompt {
735735
cmdr.Info.Printfln(apx.Trans("pkgmanagers.update.info.askNewCommand"), "list", pkgmanager.CmdList)
736736
answer, _ := reader.ReadString('\n')
737737
answer = strings.TrimSpace(answer)
@@ -747,7 +747,7 @@ func updatePkgManager(cmd *cobra.Command, args []string) error {
747747
}
748748

749749
if purge == "" {
750-
if !assumeYes {
750+
if !noPrompt {
751751
cmdr.Info.Printfln(apx.Trans("pkgmanagers.update.info.askNewCommand"), "purge", pkgmanager.CmdPurge)
752752
answer, _ := reader.ReadString('\n')
753753
answer = strings.TrimSpace(answer)
@@ -763,7 +763,7 @@ func updatePkgManager(cmd *cobra.Command, args []string) error {
763763
}
764764

765765
if remove == "" {
766-
if !assumeYes {
766+
if !noPrompt {
767767
cmdr.Info.Printfln(apx.Trans("pkgmanagers.update.info.askNewCommand"), "remove", pkgmanager.CmdRemove)
768768
answer, _ := reader.ReadString('\n')
769769
answer = strings.TrimSpace(answer)
@@ -779,7 +779,7 @@ func updatePkgManager(cmd *cobra.Command, args []string) error {
779779
}
780780

781781
if search == "" {
782-
if !assumeYes {
782+
if !noPrompt {
783783
cmdr.Info.Printfln(apx.Trans("pkgmanagers.update.info.askNewCommand"), "search", pkgmanager.CmdSearch)
784784
answer, _ := reader.ReadString('\n')
785785
answer = strings.TrimSpace(answer)
@@ -795,7 +795,7 @@ func updatePkgManager(cmd *cobra.Command, args []string) error {
795795
}
796796

797797
if show == "" {
798-
if !assumeYes {
798+
if !noPrompt {
799799
cmdr.Info.Printfln(apx.Trans("pkgmanagers.update.info.askNewCommand"), "show", pkgmanager.CmdShow)
800800
answer, _ := reader.ReadString('\n')
801801
answer = strings.TrimSpace(answer)
@@ -811,7 +811,7 @@ func updatePkgManager(cmd *cobra.Command, args []string) error {
811811
}
812812

813813
if update == "" {
814-
if !assumeYes {
814+
if !noPrompt {
815815
cmdr.Info.Printfln(apx.Trans("pkgmanagers.update.info.askNewCommand"), "update", pkgmanager.CmdUpdate)
816816
answer, _ := reader.ReadString('\n')
817817
answer = strings.TrimSpace(answer)
@@ -827,7 +827,7 @@ func updatePkgManager(cmd *cobra.Command, args []string) error {
827827
}
828828

829829
if upgrade == "" {
830-
if !assumeYes {
830+
if !noPrompt {
831831
cmdr.Info.Printfln(apx.Trans("pkgmanagers.update.info.askNewCommand"), "upgrade", pkgmanager.CmdUpgrade)
832832
answer, _ := reader.ReadString('\n')
833833
answer = strings.TrimSpace(answer)

‎cmd/stacks.go

+12-12
Original file line numberDiff line numberDiff line change
@@ -65,9 +65,9 @@ func NewStacksCommand() *cmdr.Command {
6565
)
6666
newCmd.WithBoolFlag(
6767
cmdr.NewBoolFlag(
68-
"assume-yes",
68+
"no-prompt",
6969
"y",
70-
apx.Trans("stacks.new.options.assumeYes.description"),
70+
apx.Trans("stacks.new.options.noPrompt.description"),
7171
false,
7272
),
7373
)
@@ -113,9 +113,9 @@ func NewStacksCommand() *cmdr.Command {
113113
)
114114
updateCmd.WithBoolFlag(
115115
cmdr.NewBoolFlag(
116-
"assume-yes",
116+
"no-prompt",
117117
"y",
118-
apx.Trans("stacks.update.options.assumeYes.description"),
118+
apx.Trans("stacks.update.options.noPrompt.description"),
119119
false,
120120
),
121121
)
@@ -284,14 +284,14 @@ func showStack(cmd *cobra.Command, args []string) error {
284284
}
285285

286286
func newStack(cmd *cobra.Command, args []string) error {
287-
assumeYes, _ := cmd.Flags().GetBool("assume-yes")
287+
noPrompt, _ := cmd.Flags().GetBool("no-prompt")
288288
name, _ := cmd.Flags().GetString("name")
289289
base, _ := cmd.Flags().GetString("base")
290290
packages, _ := cmd.Flags().GetString("packages")
291291
pkgManager, _ := cmd.Flags().GetString("pkg-manager")
292292

293293
if name == "" {
294-
if !assumeYes {
294+
if !noPrompt {
295295
cmdr.Info.Println(apx.Trans("stacks.new.info.askName"))
296296
fmt.Scanln(&name)
297297
if name == "" {
@@ -311,7 +311,7 @@ func newStack(cmd *cobra.Command, args []string) error {
311311
}
312312

313313
if base == "" {
314-
if !assumeYes {
314+
if !noPrompt {
315315
cmdr.Info.Println(apx.Trans("stacks.new.info.askBase"))
316316
fmt.Scanln(&base)
317317
if base == "" {
@@ -358,7 +358,7 @@ func newStack(cmd *cobra.Command, args []string) error {
358358
}
359359

360360
packagesArray := strings.Fields(packages)
361-
if len(packagesArray) == 0 && !assumeYes {
361+
if len(packagesArray) == 0 && !noPrompt {
362362
cmdr.Info.Println(apx.Trans("stacks.new.info.noPackages") + "[y/N]")
363363
reader := bufio.NewReader(os.Stdin)
364364
answer, _ := reader.ReadString('\n')
@@ -386,7 +386,7 @@ func newStack(cmd *cobra.Command, args []string) error {
386386
}
387387

388388
func updateStack(cmd *cobra.Command, args []string) error {
389-
assumeYes, _ := cmd.Flags().GetBool("assume-yes")
389+
noPrompt, _ := cmd.Flags().GetBool("no-prompt")
390390
name, _ := cmd.Flags().GetString("name")
391391
base, _ := cmd.Flags().GetString("base")
392392
packages, _ := cmd.Flags().GetString("packages")
@@ -414,7 +414,7 @@ func updateStack(cmd *cobra.Command, args []string) error {
414414
}
415415

416416
if base == "" {
417-
if !assumeYes {
417+
if !noPrompt {
418418
cmdr.Info.Printfln(apx.Trans("stacks.update.info.askBase"), stack.Base)
419419
fmt.Scanln(&base)
420420
if base == "" {
@@ -427,7 +427,7 @@ func updateStack(cmd *cobra.Command, args []string) error {
427427
}
428428

429429
if pkgManager == "" {
430-
if !assumeYes {
430+
if !noPrompt {
431431
cmdr.Info.Printfln(apx.Trans("stacks.update.info.askPkgManager"), stack.PkgManager)
432432
fmt.Scanln(&pkgManager)
433433
if pkgManager == "" {
@@ -447,7 +447,7 @@ func updateStack(cmd *cobra.Command, args []string) error {
447447

448448
packagesArray := strings.Fields(packages)
449449
cmdr.Error.Printfln("packagearray: %s", packagesArray)
450-
if len(packages) == 0 && !assumeYes {
450+
if len(packages) == 0 && !noPrompt {
451451
if len(stack.Packages) == 0 {
452452
cmdr.Info.Println(apx.Trans("stacks.update.info.noPackages") + "[y/N]")
453453
} else {

‎locales/ar.yml

+3-3
Original file line numberDiff line numberDiff line change
@@ -131,7 +131,7 @@ pkgmanagers:
131131
askCommand: "أدخل الامر لأجل '%s':"
132132
askOverwrite: "يوجد مدير حزم بنفس الاسم '%s' بالفعل. هل تريد استبداله؟"
133133
options:
134-
assumeYes:
134+
noPrompt:
135135
description: "افرض الإجابة \"نعم\" لكل الاختيارات."
136136
name:
137137
description: "اسم مدير الحزم."
@@ -249,7 +249,7 @@ stacks:
249249
askPackages: "من فضلك قم بكتابة الحزم المراد تنزيلها في التشكيلة مع فصلها بمسافة:"
250250
success: "تم إنشاء التشكيلة '%s'."
251251
options:
252-
assumeYes:
252+
noPrompt:
253253
description: "افرض الإجابة \"نعم\" لكل الاختيارات."
254254
name:
255255
description: "اسم التشكيلة."
@@ -277,7 +277,7 @@ stacks:
277277
confirmPackages: هل تريد الموافقة على قائمة الحزم الحالية؟
278278
noPackages: لم تقم بتوفير أي حزم لتثبيتها في التشكيلة. هل تريد إضافة بعضها الآن؟
279279
options:
280-
assumeYes:
280+
noPrompt:
281281
description: "افرض الإجابة \"نعم\" لكل الاختيارات."
282282
name:
283283
description: "اسم التشكيلة."

‎locales/be.yml

+3-3
Original file line numberDiff line numberDiff line change
@@ -132,7 +132,7 @@ pkgmanagers:
132132
askCommand: "Увядзіце каманду для «%s»:"
133133
askOverwrite: "Менеджэр пакетаў з назвай «%s» ужо існуе. Перазапісаць?"
134134
options:
135-
assumeYes:
135+
noPrompt:
136136
description: "Выкажам здагадку, што так на ўсе падказкі."
137137
name:
138138
description: "Імя мэнэджэра пакетаў."
@@ -250,7 +250,7 @@ stacks:
250250
падзеленыя прабелам:"
251251
success: "Створаны стэк \"%s\"."
252252
options:
253-
assumeYes:
253+
noPrompt:
254254
description: "Выкажам здагадку, што так на ўсе падказкі."
255255
name:
256256
description: "Назва стэка."
@@ -279,7 +279,7 @@ stacks:
279279
noPackages: You have not provided any packages to install in the stack. Do you
280280
want to add some now?
281281
options:
282-
assumeYes:
282+
noPrompt:
283283
description: "Выкажам здагадку, што так на ўсе падказкі."
284284
name:
285285
description: "Назва стэка."

‎locales/ca.yml

+3-3
Original file line numberDiff line numberDiff line change
@@ -136,7 +136,7 @@ pkgmanagers:
136136
askCommand: "Introdueix l'ordre per '%s':"
137137
askOverwrite: "Ja existeix un gestor de paquets anomenat '%s'. Vols sobre escriure'l?"
138138
options:
139-
assumeYes:
139+
noPrompt:
140140
description: "Assumir sí a totes les preguntes."
141141
name:
142142
description: "El nom del gestor de paquets."
@@ -256,7 +256,7 @@ stacks:
256256
per un espai:"
257257
success: "Pila Creada '%s'."
258258
options:
259-
assumeYes:
259+
noPrompt:
260260
description: "Assumir sí a totes les preguntes."
261261
name:
262262
description: "El nom de la pila."
@@ -285,7 +285,7 @@ stacks:
285285
noPackages: You have not provided any packages to install in the stack. Do you
286286
want to add some now?
287287
options:
288-
assumeYes:
288+
noPrompt:
289289
description: "Assumir sí a totes les preguntes."
290290
name:
291291
description: "El nom de la pila."

‎locales/cs.yml

+3-3
Original file line numberDiff line numberDiff line change
@@ -133,7 +133,7 @@ pkgmanagers:
133133
askCommand: "Zadejte příkaz pro '%s':"
134134
askOverwrite: "Správce balíčků s názvem '%s' již existuje. Přepsat ho?"
135135
options:
136-
assumeYes:
136+
noPrompt:
137137
description: "Automaticky zadat ano pro všechny dotazy."
138138
name:
139139
description: "Název správce balíčků."
@@ -252,7 +252,7 @@ stacks:
252252
mezerou:"
253253
success: "Stack '%s' vytvořen."
254254
options:
255-
assumeYes:
255+
noPrompt:
256256
description: "Automaticky zadat ano pro všechny dotazy."
257257
name:
258258
description: "Název stacku."
@@ -281,7 +281,7 @@ stacks:
281281
noPackages: You have not provided any packages to install in the stack. Do you
282282
want to add some now?
283283
options:
284-
assumeYes:
284+
noPrompt:
285285
description: "Automaticky zadat ano pro všechny dotazy."
286286
name:
287287
description: "Název stacku."

‎locales/de.yml

+3-3
Original file line numberDiff line numberDiff line change
@@ -139,7 +139,7 @@ pkgmanagers:
139139
askOverwrite: "Ein Paketmanager mit dem Namen '%s' existiert bereits. Überschreiben
140140
Sie ihn?"
141141
options:
142-
assumeYes:
142+
noPrompt:
143143
description: "Alle Fragen mit Ja beantworten."
144144
name:
145145
description: "Der Name des Paketmanagers."
@@ -260,7 +260,7 @@ stacks:
260260
durch ein Leerzeichen getrennt ein:"
261261
success: "Stapel '%s' erstellt."
262262
options:
263-
assumeYes:
263+
noPrompt:
264264
description: "Alle Fragen mit Ja beantworten."
265265
name:
266266
description: "Der Name des Stapels."
@@ -292,7 +292,7 @@ stacks:
292292
noPackages: Sie haben keine Pakete zur Installation im Stapel angegeben. Möchten
293293
Sie jetzt welche hinzufügen?
294294
options:
295-
assumeYes:
295+
noPrompt:
296296
description: "Alle Fragen mit Ja beantworten."
297297
name:
298298
description: "Der Name des Stapels."

0 commit comments

Comments
 (0)