[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

[PATCH] Clean-up scripts



Hi, attached are a few robustness safety nets that have appeared in shellcheck's warnings.

Cheers,

  Ondrej

>From 077df47f791837a114f49178f37f0453683b92b5 Mon Sep 17 00:00:00 2001
From: Ondrej Oprala <ondrej.oprala@gmail.com>
Date: Tue, 11 Apr 2017 16:57:07 +0200
Subject: [PATCH 1/3] Clean up scripts/*

	* scripts/dot_to_png.sh: Clean up the script according to
	shellcheck warnings and remarks.
	* scripts/dot_to_svg.sh: Likewise.
	* scripts/svg_to_plain_svg.sh: Likewise.
	* scripts/svg_to_png_and_pdf.sh: Likewise.

Signed-off-by: Ondrej Oprala <ondrej.oprala@gmail.com>
---
 scripts/dot_to_png.sh         | 10 +++++-----
 scripts/dot_to_svg.sh         | 10 +++++-----
 scripts/svg_to_plain_svg.sh   |  6 +++---
 scripts/svg_to_png_and_pdf.sh |  6 +++---
 4 files changed, 16 insertions(+), 16 deletions(-)

diff --git a/scripts/dot_to_png.sh b/scripts/dot_to_png.sh
index 24a7dc7..0929bdd 100755
--- a/scripts/dot_to_png.sh
+++ b/scripts/dot_to_png.sh
@@ -1,9 +1,9 @@
-#!/bin/bash 
+#!/bin/bash
 
 for i in *.gv
 do
-  echo $i
-  outputpng=`echo $i | sed -e 's/gv/png/'`; 
-  echo $outputpng
-  dot -v -Tpng:cairo -o $outputpng $i;
+  echo "$i"
+  outputpng=${i//gv/png}
+  echo "$outputpng"
+  dot -v -Tpng:cairo -o "$outputpng" "$i"
 done
diff --git a/scripts/dot_to_svg.sh b/scripts/dot_to_svg.sh
index 6b211f7..72d298e 100755
--- a/scripts/dot_to_svg.sh
+++ b/scripts/dot_to_svg.sh
@@ -1,9 +1,9 @@
-#!/bin/bash 
+#!/bin/bash
 
 for i in *.gv
 do
-  echo $i
-  outputsvg=`echo $i | sed -e 's/gv/svg/'`; 
-  echo $outputsvg
-  dot -v -Tsvg:cairo -o $outputsvg $i;
+  echo "$i"
+  outputsvg=${i//gv/svg}
+  echo "$outputsvg"
+  dot -v -Tsvg:cairo -o "$outputsvg" "$i"
 done
diff --git a/scripts/svg_to_plain_svg.sh b/scripts/svg_to_plain_svg.sh
index 7d877f9..5ebb7a4 100755
--- a/scripts/svg_to_plain_svg.sh
+++ b/scripts/svg_to_plain_svg.sh
@@ -1,5 +1,5 @@
-#!/bin/bash 
+#!/bin/bash
 
-for i in *.svg; 
-  do inkscape $i --export-plain-svg=`echo $i | sed -e 's/svg$/plain.svg/'`; 
+for i in *.svg;
+  do inkscape "$i" --export-plain-svg="${i//svg/plain.svg}"
 done
diff --git a/scripts/svg_to_png_and_pdf.sh b/scripts/svg_to_png_and_pdf.sh
index 451747a..b55515b 100755
--- a/scripts/svg_to_png_and_pdf.sh
+++ b/scripts/svg_to_png_and_pdf.sh
@@ -1,5 +1,5 @@
-#!/bin/bash 
+#!/bin/bash
 
-for i in *.svg; 
-  do inkscape $i --export-png=`echo $i | sed -e 's/svg$/png/'` --export-pdf=`echo $i | sed -e 's/svg$/pdf/'`; 
+for i in *.svg;
+  do inkscape "$i" --export-png="${i//svg/png}" --export-pdf="${i//svg/pdf}"
 done
-- 
2.7.4