From 4a4ed6e25507f4f9012d0c70cd28e18c9b1ab0e6 Mon Sep 17 00:00:00 2001
From: Akihiro Motoki <amotoki@gmail.com>
Date: Fri, 23 Apr 2021 03:26:15 +0900
Subject: [PATCH] iptables: (Makefile) Move embeded shell script to separate
 files

Shell script embeded in Makefile is not easy to read.
This commit moves them to separate script files
so that the readability would be much better.

Also THRESH is changed to 80 because the current released iptables
manpages were generated with THRESH=80.
---
 manual/iptables/Makefile             | 54 +++---------------------------------
 manual/iptables/tools/generatepot.sh | 15 ++++++++++
 manual/iptables/tools/translate.sh   | 20 +++++++++++++
 manual/iptables/tools/updatepo.sh    | 23 +++++++++++++++
 4 files changed, 62 insertions(+), 50 deletions(-)
 create mode 100755 manual/iptables/tools/generatepot.sh
 create mode 100755 manual/iptables/tools/translate.sh
 create mode 100755 manual/iptables/tools/updatepo.sh

diff --git a/manual/iptables/Makefile b/manual/iptables/Makefile
index bbb6eac2..9bc7c4c2 100644
--- a/manual/iptables/Makefile
+++ b/manual/iptables/Makefile
@@ -1,4 +1,4 @@
-THRESH = 100
+THRESH = 80
 EXTFLAGS =
 PO4AFLAGS += -k $(THRESH) $(EXTFLAGS)
 
@@ -21,47 +21,12 @@ translate-cmd:	$(patsubst %,_translate-%,$(notdir $(MASTER_CMD)))
 translate-lib:	$(patsubst %,_translate-%,$(notdir $(MASTER_LIB)))
 
 _translate-%:
-	@set -e; for target in $*; do \
-	  echo $$target; \
-	  p=$$(echo $* | sed -e 's|.*\.\([1-8]\)|man\1/\0|'); \
-	  pofile=po4a/$$p.ja.po; \
-	  potfile=po4a/$$p.pot; \
-	  master=original/$$p; \
-	  trans=draft/$$p; \
-	  addendum=po4a/add_ja/copyright/$(notdir $*).txt; \
-	  mkdir -p $$(dirname $$master); \
-	  if sed -e '1,3!d' $$master | grep -q '^\.so '; then \
-	    echo "Skip link file $$master"; \
-	  else \
-	    po4a-translate $(PO4AFLAGS) -f man -p $$pofile -l $$trans -m $$master \
-	      --addendum $$addendum; \
-	  fi; \
-	done
+	@PO4AFLAGS="$(PO4AFLAGS)" ./tools/translate.sh $*
 
 updatepo:	$(patsubst %,_updatepo-%,$(notdir $(MASTER_ROFFS)))
 
 _updatepo-%:
-	@set -e; for target in $*; do \
-	  p=$$(echo $* | sed -e 's|.*\.\([1-8]\)|man\1/\0|'); \
-	  pofile=po4a/$$p.ja.po; \
-	  potfile=po4a/$$p.pot; \
-	  master=original/$$p; \
-	  if sed -e '1,3!d' $$master | grep -q '^\.so '; then \
-	    echo "Skip link file $$master"; \
-	  elif [ -f $$pofile ]; then \
-	    echo "po4a-updatepo $$pofile <- $$master"; \
-	    po4a-updatepo -f man --previous --msgmerge-opt='$(MSGMERGE_OPTS)' \
-	      -p $$pofile -m $$master; \
-	  else \
-	    echo "po4a-gettextize $$pofile <- $$master"; \
-	    mkdir -p $$(dirname $$pofile); \
-	    po4a-gettextize -f man -p $$pofile -m $$master; \
-	    sed -i -e 's|"Content-Type: text/plain; charset=CHARSET\\n"|"Content-Type: text/plain; charset=UTF-8\\n"|' $$pofile; \
-	    cp $$pofile $$potfile; \
-	    msgmerge $(MSGMERGE_OPTS) -o $$pofile $$pofile $$potfile; \
-	    $(RM) $$potfile; \
-	  fi; \
-	done
+	@MSGMERGE_OPTS="$(MSGMERGE_OPTS)" ./tools/updatepo.sh $*
 
 stat:
 	@for po in $(POFILES); do \
@@ -72,18 +37,7 @@ stat:
 pot:	$(patsubst %,_pot-%,$(notdir $(MASTER_ROFFS)))
 
 _pot-%:
-	@set -e; for target in $*; do \
-	  p=$$(echo $* | sed -e 's|.*\.\([1-8]\)|man\1/\0|'); \
-	  pofile=po4a/$$p.ja.po; \
-	  potfile=po4a/$$p.pot; \
-	  master=original/$$p; \
-	  if sed -e '1,3!d' $$master | grep -q '^\.so '; then \
-	    echo "Skip link file $$master"; \
-	  else \
-	    echo "po4a-gettextize $$potfile <- $$master"; \
-	    po4a-gettextize -f man -p $$potfile -m $$master; \
-	  fi; \
-	done
+	@./tools/generatepot.sh $*
 
 pot-clean:
 	$(RM) -v $(POTFILES)
diff --git a/manual/iptables/tools/generatepot.sh b/manual/iptables/tools/generatepot.sh
new file mode 100755
index 00000000..405a305d
--- /dev/null
+++ b/manual/iptables/tools/generatepot.sh
@@ -0,0 +1,15 @@
+#!/bin/bash -e
+
+target=$1
+
+p=$(echo $target | sed -E -e 's|(.*\.([1-8]))|man\2/\1|')
+
+pofile=po4a/$p.ja.po
+potfile=po4a/$p.pot
+master=original/$p
+if sed -e '1,3!d' $master | grep -q '^\.so '; then
+  echo "Skip link file $master"
+else
+  echo "po4a-gettextize $potfile <- $master"
+  po4a-gettextize -f man -p $potfile -m $master
+fi
diff --git a/manual/iptables/tools/translate.sh b/manual/iptables/tools/translate.sh
new file mode 100755
index 00000000..6cfdd106
--- /dev/null
+++ b/manual/iptables/tools/translate.sh
@@ -0,0 +1,20 @@
+#!/bin/bash -e
+
+target=$1
+
+p=$(echo $target | sed -E -e 's|(.*\.([1-8]))|man\2/\1|')
+pofile=po4a/$p.ja.po
+potfile=po4a/$p.pot
+master=original/$p
+trans=draft/$p
+addendum=po4a/add_ja/copyright/$target.txt
+
+mkdir -p $(dirname $master)
+
+if sed -e '1,3!d' $master | grep -q '^\.so '; then
+  echo "Skip link file $master"
+else
+  echo "Processing $target..."
+  po4a-translate $PO4AFLAGS -f man -p $pofile -l $trans -m $master \
+    --addendum $addendum
+fi
diff --git a/manual/iptables/tools/updatepo.sh b/manual/iptables/tools/updatepo.sh
new file mode 100755
index 00000000..d126da99
--- /dev/null
+++ b/manual/iptables/tools/updatepo.sh
@@ -0,0 +1,23 @@
+#!/bin/bash -e
+
+target=$1
+
+p=$(echo $target | sed -E -e 's|(.*\.([1-8]))|man\2/\1|')
+pofile=po4a/$p.ja.po
+potfile=po4a/$p.pot
+master=original/$p
+if sed -e '1,3!d' $master | grep -q '^\.so '; then
+  echo "Skip link file $master"
+elif [ -f $pofile ]; then
+  echo "po4a-updatepo $pofile <- $master"
+  po4a-updatepo -f man --previous --msgmerge-opt="$MSGMERGE_OPTS" \
+    -p $pofile -m $master
+else
+  echo "po4a-gettextize $pofile <- $master"
+  mkdir -p `dirname $pofile`
+  po4a-gettextize -f man -p $pofile -m $master
+  sed -i -e 's|"Content-Type: text/plain; charset=CHARSET\\n"|"Content-Type: text/plain; charset=UTF-8\\n"|' $pofile
+  cp $pofile $potfile
+  msgmerge "$MSGMERGE_OPTS" -o $pofile $pofile $potfile
+  rm -f $potfile
+fi
-- 
2.11.0