@@ -567,39 +567,52 @@ main(int argc, char *argv[])
567
567
print ("Welcome to mkiocccentry version: %s\n" , MKIOCCCENTRY_VERSION );
568
568
}
569
569
570
+
570
571
/*
571
- * warn (if not -q/quiet mode) user that with -i answers (or -y) we will
572
- * always answer yes. This is especially important (in fact absolutely
573
- * essential for -i answers) because if there was a change in file set(s)
574
- * then the answers file would be entirely useless!
572
+ * warn about -Y option
575
573
*/
576
- if (answer_yes && !quiet ) {
574
+ if (force_yes ) {
575
+ para ("" ,
576
+ "WARNING: you've chosen to answer YES to ALL prompts. If this was" ,
577
+ "unintentional, run the program again without specifying -Y. We cannot" ,
578
+ "stress the importance of this enough! Well OK, we can overstress most things" ,
579
+ "but you get the point; do not use the -Y option without EXTREME caution!" ,
580
+ "" ,
581
+ "Hint: this option is mostly useful for mkiocccentry_test.sh; if you REALLY" ,
582
+ "want to answer yes you should use -y instead which will allow you to still" ,
583
+ "verify certain things." ,
584
+ "" ,
585
+ NULL );
586
+
577
587
/*
578
- * we could use msg() but this performs more checks which is very
579
- * important for this
588
+ * if not quiet give a shorter warning as well
580
589
*/
581
- print ("%s" , "Notice: we will always answer yes to questions." );
590
+ if (!quiet ) {
591
+ print ("%s" , "Notice: we will ALWAYS answer YES to questions.\n" );
592
+ }
593
+ } else if (answer_yes ) {
594
+ /* warn about -y option */
595
+ para ("" ,
596
+ "WARNING: you've chosen to answer yes to ALMOST ALL prompts. If this was" ,
597
+ "unintentional, run the program again without specifying -y. We cannot" ,
598
+ "stress the importance of this enough! Well OK, we can overstress most things" ,
599
+ "but you get the point; do not use the -y option without EXTREME caution!" ,
600
+ "" ,
601
+ NULL );
602
+ /*
603
+ * if not quiet give a shorter warning as well
604
+ */
605
+ if (!quiet ) {
606
+ print ("%s" , "Notice: we will answer YES to MOST questions.\n" );
607
+ }
582
608
}
583
609
584
610
585
-
586
611
/*
587
612
* save our version
588
613
*/
589
614
info .mkiocccentry_ver = MKIOCCCENTRY_VERSION ;
590
615
dbg (DBG_HIGH , "info.mkiocccentry_ver: %s" , info .mkiocccentry_ver );
591
-
592
- /* warn about -y option */
593
- if (answer_yes ) {
594
- para ("" ,
595
- "WARNING: you've chosen to answer yes to almost all prompts. If this was" ,
596
- "unintentional, run the program again without specifying -y. We cannot" ,
597
- "stress the importance of this enough! Well OK, we can overstress most things" ,
598
- "but you get the point; do not use the -y option without EXTREME caution!" ,
599
- "" ,
600
- NULL );
601
- }
602
-
603
616
/* if the user requested to ignore warnings, and now -E, then ignore this once and warn them :) */
604
617
if (ignore_warnings ) {
605
618
para ("" ,
0 commit comments