zephyr-sdk/0001-scripts-template_dir-d...

29 lines
708 B
Diff

From b8d47d156f3e89237a80b349eb2ec48160046b05 Mon Sep 17 00:00:00 2001
From: Alexei Colin <ac@alexeicolin.com>
Date: Sat, 18 Jul 2020 12:06:52 -0400
Subject: [PATCH 1/4] scripts/template_dir: don't let -y override -[no]rc
Overlooked in 6dd3e26c271bbf139f6d30523bc55fc7673b52f5
---
scripts/template_dir | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
diff --git a/scripts/template_dir b/scripts/template_dir
index 1ae2794..ab3394c 100644
--- a/scripts/template_dir
+++ b/scripts/template_dir
@@ -66,7 +66,9 @@ while [ "$1" != "" ]; do
;;
-y )
confirm="y";
- rc_confirm="y";
+ if [ -z "$rc_confirm" ]; then
+ rc_confirm="y"
+ fi
;;
-rc )
rc_confirm="y";
--
2.27.0