summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLouie S <louie@example.com>2023-09-15 10:11:41 -0400
committerLouie S <louie@example.com>2023-09-15 10:11:41 -0400
commitd44e7f620f4970ab72bd7979cd8751857f683915 (patch)
tree72518b296a6877ce063430779687ee9896640974
parentd4bd46635fe9a74bf35812ee5b635af177e74cfc (diff)
Improve design, fix guide names for info-reader targetHEADmaster
-rw-r--r--Makefile4
-rw-r--r--info-reader-Makefile5
-rwxr-xr-xsrc/index-page.sh12
-rw-r--r--src/info-reader/get_title8
-rw-r--r--src/texinfo/get_title8
-rw-r--r--texinfo-Makefile5
6 files changed, 30 insertions, 12 deletions
diff --git a/Makefile b/Makefile
index 05363ad..1393e77 100644
--- a/Makefile
+++ b/Makefile
@@ -11,3 +11,7 @@ info-reader:
clean:
$(MAKE) clean -f texinfo-Makefile
$(MAKE) clean -f info-reader-Makefile
+
+.PHONY: dist-clean
+dist-clean: clean
+ rm -rf tmp
diff --git a/info-reader-Makefile b/info-reader-Makefile
index 8b8c3a7..2ad144d 100644
--- a/info-reader-Makefile
+++ b/info-reader-Makefile
@@ -1,4 +1,5 @@
DOCSET_NAME = Standalone_Info_Reader
+SIMPLE_NAME = info-reader
DOCSET_DIR = $(DOCSET_NAME).docset
CONTENTS_DIR = $(DOCSET_DIR)/Contents
@@ -11,7 +12,7 @@ ICON_FILE = $(DOCSET_DIR)/icon.png
ARCHIVE_FILE = $(DOCSET_NAME).tgz
SRC_ICON = src/icon.png
-SRC_PLIST = src/info-reader/Info.plist
+SRC_PLIST = src/$(SIMPLE_NAME)/Info.plist
PAGE_INDEXING_SCRIPT = src/index-page.sh
TERM_INDEXING_SCRIPT = src/index-terms.sh
@@ -76,7 +77,7 @@ $(INFO_PLIST_FILE): $(SRC_PLIST) $(CONTENTS_DIR)
$(INDEX_FILE): $(PAGE_INDEXING_SCRIPT) $(TERM_INDEXING_SCRIPT) $(DOCUMENTS_DIR)
rm -f $@
- $(PAGE_INDEXING_SCRIPT) $@ $(DOCUMENTS_DIR)/*.html
+ $(PAGE_INDEXING_SCRIPT) $(SIMPLE_NAME) $@ $(DOCUMENTS_DIR)/*.html
$(TERM_INDEXING_SCRIPT) Entry $@ $(DOCUMENTS_DIR)/Index.html
$(ICON_FILE): src/icon.png $(DOCSET_DIR)
diff --git a/src/index-page.sh b/src/index-page.sh
index ef398af..becfd48 100755
--- a/src/index-page.sh
+++ b/src/index-page.sh
@@ -5,17 +5,13 @@
# shellcheck source=./lib/insert
. "$(dirname "$0")"/lib/insert
-DB_PATH="$1"
+CALLER="$1"
shift
-get_title() {
- FILE="$1"
+. "$(dirname "$0")"/"$CALLER"/get_title
- pup -p -f "$FILE" 'title text{}' | \
- tr -d \\n | \
- sed 's/ (GNU[^)]*)$//' | \
- sed 's/\"/\"\"/g'
-}
+DB_PATH="$1"
+shift
insert_pages() {
# Get title and insert into table for each html file
diff --git a/src/info-reader/get_title b/src/info-reader/get_title
new file mode 100644
index 0000000..b09c385
--- /dev/null
+++ b/src/info-reader/get_title
@@ -0,0 +1,8 @@
+get_title() {
+ FILE="$1"
+
+ pup -p -f "$FILE" 'title text{}' | \
+ tr -d \\n | \
+ sed 's/ ([^)]*GNU[^)]*)$//' | \
+ sed 's/\"/\"\"/g'
+}
diff --git a/src/texinfo/get_title b/src/texinfo/get_title
new file mode 100644
index 0000000..b501501
--- /dev/null
+++ b/src/texinfo/get_title
@@ -0,0 +1,8 @@
+get_title() {
+ FILE="$1"
+
+ pup -p -f "$FILE" 'title text{}' | \
+ tr -d \\n | \
+ sed 's/ (GNU[^)]*)$//' | \
+ sed 's/\"/\"\"/g'
+}
diff --git a/texinfo-Makefile b/texinfo-Makefile
index 581dfc0..52ea1b2 100644
--- a/texinfo-Makefile
+++ b/texinfo-Makefile
@@ -1,4 +1,5 @@
DOCSET_NAME = GNU_Texinfo
+SIMPLE_NAME = texinfo
DOCSET_DIR = $(DOCSET_NAME).docset
CONTENTS_DIR = $(DOCSET_DIR)/Contents
@@ -11,7 +12,7 @@ ICON_FILE = $(DOCSET_DIR)/icon.png
ARCHIVE_FILE = $(DOCSET_NAME).tgz
SRC_ICON = src/icon.png
-SRC_PLIST = src/texinfo/Info.plist
+SRC_PLIST = src/$(SIMPLE_NAME)/Info.plist
PAGE_INDEXING_SCRIPT = src/index-page.sh
TERM_INDEXING_SCRIPT = src/index-terms.sh
@@ -76,7 +77,7 @@ $(INFO_PLIST_FILE): $(SRC_PLIST) $(CONTENTS_DIR)
$(INDEX_FILE): $(PAGE_INDEXING_SCRIPT) $(TERM_INDEXING_SCRIPT) $(DOCUMENTS_DIR)
rm -f $@
- $(PAGE_INDEXING_SCRIPT) $@ $(DOCUMENTS_DIR)/*.html
+ $(PAGE_INDEXING_SCRIPT) $(SIMPLE_NAME) $@ $(DOCUMENTS_DIR)/*.html
$(TERM_INDEXING_SCRIPT) Command $@ $(DOCUMENTS_DIR)/Command-and-Variable-Index.html
$(TERM_INDEXING_SCRIPT) Entry $@ $(DOCUMENTS_DIR)/General-Index.html