From 1e6a7a7da4e6cae9986b6f8cbb2558df4de8ea42 Mon Sep 17 00:00:00 2001
From: Louie S <louie@example.com>
Date: Thu, 14 Sep 2023 13:53:09 -0400
Subject: Working, albeit showing some unknown errors during the build process

---
 src/index-page.sh  | 35 +++++++++++++++++++++++++++++++++++
 src/index-terms.sh | 33 +++++++++++++++++++++++++++++++++
 src/index.sh       | 35 -----------------------------------
 texinfo-Makefile   |  8 ++++++--
 4 files changed, 74 insertions(+), 37 deletions(-)
 create mode 100755 src/index-page.sh
 create mode 100755 src/index-terms.sh
 delete mode 100755 src/index.sh

diff --git a/src/index-page.sh b/src/index-page.sh
new file mode 100755
index 0000000..7a1b60d
--- /dev/null
+++ b/src/index-page.sh
@@ -0,0 +1,35 @@
+#!/usr/bin/env sh
+
+# shellcheck source=./lib/create_table
+. "$(dirname "$0")"/lib/create_table
+# shellcheck source=./lib/insert
+. "$(dirname "$0")"/lib/insert
+
+DB_PATH="$1"
+shift
+
+get_title() {
+	FILE="$1"
+
+	pup -p -f "$FILE" 'title text{}' | \
+		tr -d \\n | \
+		sed 's/(GNU[^)]*)$//' | \
+		sed 's/\"/\"\"/g'
+}
+
+insert_pages() {
+	# Get title and insert into table for each html file
+	while [ -n "$1" ]; do
+		unset PAGE_NAME
+		unset PAGE_TYPE
+		PAGE_NAME="$(get_title "$1")"
+		PAGE_TYPE="Guide"
+		if [ -n "$PAGE_NAME" ]; then
+			insert "$DB_PATH" "$PAGE_NAME" "$PAGE_TYPE" "$(basename "$1")"
+		fi
+		shift
+	done
+}
+
+create_table "$DB_PATH"
+insert_pages "$@"
diff --git a/src/index-terms.sh b/src/index-terms.sh
new file mode 100755
index 0000000..f74af03
--- /dev/null
+++ b/src/index-terms.sh
@@ -0,0 +1,33 @@
+#!/usr/bin/env sh
+
+# shellcheck source=./lib/create_table
+. "$(dirname "$0")"/lib/create_table
+# shellcheck source=./lib/insert
+. "$(dirname "$0")"/lib/insert
+
+TYPE="$1"
+shift
+DB_PATH="$1"
+shift
+
+insert_index_terms() {
+	# Get each term from an index page and insert
+	while [ -n "$1" ]; do
+		grep -Eo "<a href.*</a>:" "$1" | while read -r line; do
+			insert_term "$line"
+		done
+
+		shift
+	done
+}
+
+insert_term() {
+	LINK="$1"
+	NAME="$(echo "$LINK" | pup -p 'a text{}' | sed 's/\"\"//g' | tr -d \\n)"
+	PAGE_PATH="$(echo "$LINK" | pup -p 'a attr{href}')"
+
+	insert "$DB_PATH" "$NAME" "$TYPE" "$PAGE_PATH"
+}
+
+create_table "$DB_PATH"
+insert_index_terms "$@"
diff --git a/src/index.sh b/src/index.sh
deleted file mode 100755
index 7a1b60d..0000000
--- a/src/index.sh
+++ /dev/null
@@ -1,35 +0,0 @@
-#!/usr/bin/env sh
-
-# shellcheck source=./lib/create_table
-. "$(dirname "$0")"/lib/create_table
-# shellcheck source=./lib/insert
-. "$(dirname "$0")"/lib/insert
-
-DB_PATH="$1"
-shift
-
-get_title() {
-	FILE="$1"
-
-	pup -p -f "$FILE" 'title text{}' | \
-		tr -d \\n | \
-		sed 's/(GNU[^)]*)$//' | \
-		sed 's/\"/\"\"/g'
-}
-
-insert_pages() {
-	# Get title and insert into table for each html file
-	while [ -n "$1" ]; do
-		unset PAGE_NAME
-		unset PAGE_TYPE
-		PAGE_NAME="$(get_title "$1")"
-		PAGE_TYPE="Guide"
-		if [ -n "$PAGE_NAME" ]; then
-			insert "$DB_PATH" "$PAGE_NAME" "$PAGE_TYPE" "$(basename "$1")"
-		fi
-		shift
-	done
-}
-
-create_table "$DB_PATH"
-insert_pages "$@"
diff --git a/texinfo-Makefile b/texinfo-Makefile
index d41a6a1..581dfc0 100644
--- a/texinfo-Makefile
+++ b/texinfo-Makefile
@@ -12,6 +12,8 @@ ARCHIVE_FILE    = $(DOCSET_NAME).tgz
 
 SRC_ICON = src/icon.png
 SRC_PLIST = src/texinfo/Info.plist
+PAGE_INDEXING_SCRIPT = src/index-page.sh
+TERM_INDEXING_SCRIPT = src/index-terms.sh
 
 MANUAL_URL  = https://www.gnu.org/software/texinfo/manual/texinfo/texinfo.html_node.tar.gz
 MANUAL_FILE = tmp/texinfo.html_node.tar.gz
@@ -72,9 +74,11 @@ $(DOCUMENTS_DIR): $(RESOURCES_DIR) $(MANUAL_FILE)
 $(INFO_PLIST_FILE): $(SRC_PLIST) $(CONTENTS_DIR)
 	cp $(SRC_PLIST) $@
 
-$(INDEX_FILE): src/index.sh $(DOCUMENTS_DIR)
+$(INDEX_FILE): $(PAGE_INDEXING_SCRIPT) $(TERM_INDEXING_SCRIPT) $(DOCUMENTS_DIR)
 	rm -f $@
-	src/index.sh $@ $(DOCUMENTS_DIR)/*.html
+	$(PAGE_INDEXING_SCRIPT) $@ $(DOCUMENTS_DIR)/*.html
+	$(TERM_INDEXING_SCRIPT) Command $@ $(DOCUMENTS_DIR)/Command-and-Variable-Index.html
+	$(TERM_INDEXING_SCRIPT) Entry $@ $(DOCUMENTS_DIR)/General-Index.html
 
 $(ICON_FILE): src/icon.png $(DOCSET_DIR)
 	cp $(SRC_ICON) $@
-- 
cgit