From 2584b9d4f2c5b278d19bb86b91eb92da1795aaed Mon Sep 17 00:00:00 2001
From: "Kyle J. McKay" <mackyle@gmail.com>
Date: Tue, 3 Aug 2021 21:06:12 -0700
Subject: [PATCH] projtool.pl: add missing nested braces

The "redo" statement requires an actual block; a bunch of statements
grouped in a pair of braces ('{'...'}') as part of a conditional
does not qualify.

Add the necessary extra pair of braces to make the bodies of these
conditionals that use `redo` actually be able to `redo`.

This was previously handled properly, but when some new options
were added the extra pair of braces was overlooked for them.

Add them now to correct the problem.

Signed-off-by: Kyle J. McKay <mackyle@gmail.com>
---
 toolbox/projtool.pl | 30 +++++++++++++++---------------
 1 file changed, 15 insertions(+), 15 deletions(-)

diff --git a/toolbox/projtool.pl b/toolbox/projtool.pl
index 7213b96..77c83d5 100755
--- a/toolbox/projtool.pl
+++ b/toolbox/projtool.pl
@@ -10,7 +10,7 @@
 use strict;
 use warnings;
 use vars qw($VERSION);
-BEGIN {*VERSION = \'1.0.5'}
+BEGIN {*VERSION = \'1.0.6'}
 use File::Basename;
 use Digest::MD5 qw(md5_hex);
 use IO::Socket;
@@ -543,7 +543,7 @@ sub cmd_create {
 		$settings{crypt} = scrypt_sha1($np1);
 	}
 	my $owner = "";
-	unless ($noowner) {
+	unless ($noowner) {{
 		$owner = prompt_or_die("Owner/email name for project $projname");
 		unless (valid_email($owner)) {
 			unless ($force) {
@@ -559,7 +559,7 @@ sub cmd_create {
 			}
 			warn "Allowing email longer than 96 characters with --force\n" unless $quiet;
 		}
-	}
+	}}
 	$settings{email} = $owner;
 	my $baseurl = "";
 	my $checkmirror = sub {
@@ -641,12 +641,12 @@ sub cmd_create {
 		$desc =~ s/^\s+//; $desc =~ s/\s+$//;
 		$desc eq "" || &$checkdesc($desc) or
 			die "Invalid --desc description\n";
-	} elsif (!$defaults) {
+	} elsif (!$defaults) {{
 		$desc = prompt_or_die("Short description", "");
 		$desc =~ s/^\s+//; $desc =~ s/\s+$//;
 		$desc eq "" || &$checkdesc($desc) or redo;
 		$desc = undef if $desc eq "";
-	}
+	}}
 	defined($desc) or $desc = $mirror ? "Mirror of $baseurl" : "Push project $projname";
 	$settings{desc} = $desc;
 	my $checkhp = sub {
@@ -664,15 +664,15 @@ sub cmd_create {
 		$homepage =~ s/^\s+//; $homepage =~ s/\s+$//;
 		$homepage eq "" || &$checkhp($homepage) or
 			die "Invalid --homepage URL\n";
-	} elsif (!$defaults) {
+	} elsif (!$defaults) {{
 		$homepage = prompt_or_die("Home page URL", "");
 		$homepage =~ s/^\s+//; $homepage =~ s/\s+$//;
 		$homepage eq "" || &$checkhp($homepage) or redo;
 		$homepage = undef if $homepage eq "";
-	}
+	}}
 	$settings{hp} = $homepage;
 	my $jsonurl = "";
-	if (!$defaults) {
+	if (!$defaults) {{
 		$jsonurl = prompt_or_die("JSON notify POST URL", "");
 		if ($jsonurl ne "" && !valid_web_url($jsonurl)) {
 			unless ($force) {
@@ -681,10 +681,10 @@ sub cmd_create {
 			}
 			warn "Allowing invalid JSON notify POST URL with --force\n" unless $quiet;
 		}
-	}
+	}}
 	$settings{notifyjson} = $jsonurl;
 	my $commitaddrs = "";
-	if (!$defaults) {
+	if (!$defaults) {{
 		$commitaddrs = clean_addrlist(prompt_or_die("Commit notify email addr(s)", ""));
 		if ($commitaddrs ne "" && !valid_addrlist($commitaddrs)) {
 			unless ($force) {
@@ -693,7 +693,7 @@ sub cmd_create {
 			}
 			warn "using invalid commit notify email address list with --force\n" unless $quiet;
 		}
-	}
+	}}
 	$settings{notifymail} = $commitaddrs;
 	$settings{reverseorder} = 1;
 	$settings{reverseorder} = ynprompt_or_die("Oldest-to-newest commit order in emails", "Yes")
@@ -701,7 +701,7 @@ sub cmd_create {
 	$settings{summaryonly} = ynprompt_or_die("Summary only (no diff) in emails", "No")
 		if !$defaults && $commitaddrs ne "";
 	my $tagaddrs = "";
-	if (!$defaults) {
+	if (!$defaults) {{
 		$tagaddrs = clean_addrlist(prompt_or_die("Tag notify email addr(s)", ""));
 		if ($tagaddrs ne "" && !valid_addrlist($tagaddrs)) {
 			unless ($force) {
@@ -710,16 +710,16 @@ sub cmd_create {
 			}
 			warn "using invalid tag notify email address list with --force\n" unless $quiet;
 		}
-	}
+	}}
 	$settings{notifytag} = $tagaddrs;
-	if (!$mirror && !$ispush) {
+	if (!$mirror && !$ispush) {{
 		my @newusers = ();
 		{
 			my $userlist = prompt_or_die("Push users", join(",", @newusers));
 			eval {@newusers = validate_users($userlist, $force); 1;} or redo;
 		}
 		$settings{users} = \@newusers;
-	}
+	}}
 	my $newproj = Girocco::Project->ghost($projname, $mirror, $orphanok, $optp)
 		or die "Girocco::Project->ghost call failed\n";
 	my ($k, $v);
-- 
2.11.4.GIT