From c6ce7d6ba0272ab78b2dd09e3fadc49b577961c0 Mon Sep 17 00:00:00 2001
From: Luke Shumaker <LukeShu@sbcglobal.net>
Date: Fri, 28 Sep 2012 10:38:59 -0400
Subject: Change how the main help menu works

---
 Makefile     | 6 +++---
 jh-.help.txt | 0
 jh.sh        | 7 ++++++-
 3 files changed, 9 insertions(+), 4 deletions(-)
 delete mode 100644 jh-.help.txt

diff --git a/Makefile b/Makefile
index 4794be4..70b1ec1 100644
--- a/Makefile
+++ b/Makefile
@@ -4,14 +4,14 @@ dirs = $(DESTDIR)/usr/share/jh $(DESTDIR)/usr/bin
 ####
 
 subcommand_files = $(addprefix jh-,$(subcommands))
-help_files = $(addsuffix .help.txt,jh- $(subcommand_files))
+help_files = $(addsuffix .help.txt,$(subcommand_files))
 
 all: PHONY build
 
 ####
 
-build: PHONY jh $(subcommand_files) $(help_files)
-install: $(DESTDIR)/usr/bin/jh $(addprefix $(DESTDIR)/usr/share/jh/,$(subcommand_files) $(help_files))
+build: PHONY jh $(subcommand_files)
+install: PHONY $(DESTDIR)/usr/bin/jh $(addprefix $(DESTDIR)/usr/share/jh/,$(subcommand_files) $(help_files))
 
 $(DESTDIR)/usr/share/jh/%: % | $(DESTDIR)/usr/share/jh
 	cp '$<' '$@'
diff --git a/jh-.help.txt b/jh-.help.txt
deleted file mode 100644
index e69de29..0000000
diff --git a/jh.sh b/jh.sh
index a7c25a9..7dfe3c5 100644
--- a/jh.sh
+++ b/jh.sh
@@ -12,7 +12,12 @@ fi
 usage() {
 	cmd="${1-$0}"
 	file="$JH_PATH/jh-$cmd.help.txt"
-	if [[ -f "$JH_PATH/jh-$cmd.help.txt" ]]; then
+	if [[ -z "$cmd" ]]; then
+		echo "Usage: $jh_short <command> [command-specific-arguments]"
+		echo "Java helper for PKGBUILDs"
+		echo ""
+		"$jh_short" list-commands|sed 's/./  &/'
+	elif [[ -f "$JH_PATH/jh-$cmd.help.txt" ]]; then
 		sed "s|@cmd@|$jh_short|g" "$file" >> /dev/stderr
 	else
 		echo "$jh_short: Cannot find help file for '$cmd'" >> /dev/stderr
-- 
cgit v1.2.2