From 54b6f6430b35d73507b0dcbfac9f85074c670e39 Mon Sep 17 00:00:00 2001
From: Wolfram Sang <wsa+renesas@sang-engineering.com>
Date: Wed, 23 Jan 2019 20:07:07 +0100
Subject: scripts/periupport_conv: refactor filename generation into seperate
 function

And don't produce useless '_' when generating filenames.

Reported-by: Laurent Pinchart <laurent.pinchart+renesas@ideasonboard.com>
Signed-off-by: Wolfram Sang <wsa+renesas@sang-engineering.com>
---
 scripts/periupport_conv | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/scripts/periupport_conv b/scripts/periupport_conv
index 2a74007..aa1956d 100755
--- a/scripts/periupport_conv
+++ b/scripts/periupport_conv
@@ -9,6 +9,11 @@ DST="$2"
 uuid_cmd="cat /proc/sys/kernel/random/uuid"
 
 gawk -F: -v dst="$DST" -v cmd="$uuid_cmd" '
+	function make_filename(nam) {
+			gsub(/[: /]+/, "_", nam)
+			sub(/_$/, "", nam)
+			return nam
+		}
 	$1 == "B" {
 			bsp_id = $2
 			desc = substr($0, 46)
@@ -32,10 +37,8 @@ gawk -F: -v dst="$DST" -v cmd="$uuid_cmd" '
 			FS = " "
 			for (task in tasks) {
 
-				 nam = task
-				 gsub(/[: /]/, "_", nam)
 				cmd | getline uuid; close(cmd);
-				F=dst "/" nam ".yaml"
+				F = dst "/" make_filename(task) ".yaml"
 
 				delete(sorted_idx)
 				asorti(tasks[task], sorted_idx)
-- 
cgit v1.2.3