Merge branch '1-mgam-skip-not-master' into 'master'

mgam changes to improve output and skip repos not checked out to 'master'

See merge request !6

mgam.mjs

@@ -52,32 +52,42 @@ for (const repo of config.mgam.repos) {
 
 	const wd = (!repo.startsWith("/") ? path.join(os.homedir(), repo) : repo);
 
-	console.log(chalk.bold.bgBlue(`\n${wd}\n`));
+	console.log(chalk.bold.bgBlue(`\n${wd}`));
 
-	const cmds = [
-		`git checkout -b "${config.mgam.branch}"`,
-		`git add ${config.mgam.commit.paths.join(" ")}`,
-		[
-			`git commit -m "${config.mgam.commit.title.replaceAll('"', '\"')}"`,
-			(config.mgam.commit.description ? `-m "${config.mgam.commit.description.replaceAll('"', '\"')}"` : "")
-		].join(" ").trim(),
-		`git push -u origin HEAD -o merge_request.create -o merge_request.target=master`,
-		`git checkout master`
-	];
+	try {
 
-	for (const cmd of cmds) {
+		const currentBranch = child_process.execSync("git branch --show-current", {"cwd": wd}).toString().trim()
 
-		try {
-			child_process.execSync(cmd, {"cwd": wd, "stdio": "inherit"});
-		}
-		catch (e) {
-			console.error(e);
-			console.log(chalk.red(`Aborting operation for repository "${wd}" due to error.`));
+		if (currentBranch !== "master") {
+			console.log(chalk.yellow(`Skipping repository (not checked out to master branch).`));
 			continue;
 		}
 
+		const cmds = [
+			`git checkout -b "${config.mgam.branch}"`,
+			`git add ${config.mgam.commit.paths.join(" ")}`,
+			[
+				`git commit -m "${config.mgam.commit.title.replaceAll('"', '\"')}"`,
+				(config.mgam.commit.description ? `-m "${config.mgam.commit.description.replaceAll('"', '\"')}"` : "")
+			].join(" ").trim(),
+			`git push -u origin HEAD -o merge_request.create -o merge_request.target=master`,
+			`git checkout master`
+		];
+
+		for (const cmd of cmds) {
+			child_process.execSync(cmd, {"cwd": wd, "stdio": "inherit"});
+		}
+
+	}
+
+	catch (e) {
+		console.log(chalk.red(`Error: ${e}.`));
+		continue;
 	}
 
+
 }
 
+console.log("");
+
 process.exit(0);