summarylogtreecommitdiffstats
path: root/0001-scripts-template_dir-don-t-let-y-override-no-rc.patch
blob: aed4ac006242097eb4de5968ad13b8d88644b6ff (plain)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
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