Change main output file to gemini2html

4 files changed, 13 insertions, 13 deletions

diff --git a/.gitignore b/.gitignore
index a51ba96..1a39094 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,3 +1,3 @@
 gemini2html.o
-main
+gemini2html
 test
\ No newline at end of file
diff --git a/Makefile b/Makefile
index 4f993c6..417c7b9 100644
--- a/Makefile
+++ b/Makefile
@@ -19,19 +19,19 @@ gemini2html: $(SRCDIR)/gemini2html.c
 	@$(CC) -c $(CFLAGS) -o gemini2html.o $(SRCDIR)/gemini2html.c
 
 main: $(SRCDIR)/gemini2html.c $(SRCDIR)/main.c
-	@$(CC) $(CFLAGS) -o main $(SRCDIR)/gemini2html.c $(SRCDIR)/main.c
+	@$(CC) $(CFLAGS) -o gemini2html $(SRCDIR)/gemini2html.c $(SRCDIR)/main.c
 
 test: $(TESTDIR)/test.c $(SRCDIR)/gemini2html.c
 	@$(CC) $(CFLAGS) -o test $(TESTDIR)/test.c $(SRCDIR)/gemini2html.c
 
 install_user: all
 	@mkdir -m755 -p $(MANDIRUSER)/man1
-	@install -m755 main $(BINDIRUSER)/gemini2html
+	@install -m755 gemini2html $(BINDIRUSER)/gemini2html
 	@install -m755 gemini2html.1 $(MANDIRUSER)/man1/gemini2html.1
 
 install_sys: all
 	@mkdir -m755 -p $(MANDIRSYS)/man1
-	@install -m755 main $(BINDIRSYS)/gemini2html
+	@install -m755 gemini2html $(BINDIRSYS)/gemini2html
 	@install -m755 gemini2html.1 $(MANDIRSYS)/man1/gemini2html.1
 
 uninstall_user:
@@ -45,6 +45,6 @@ uninstall_sys:
 uninstall: uninstall_user uninstall_sys
 
 clean:
-	@$(RM) gemini2html.o main test
+	@$(RM) gemini2html.o gemini2html test
 
 .PHONY: default all install_user install_sys uninstall_user uninstall_sys uninstall clean
diff --git a/gemini2html.1 b/gemini2html.1
index b3964f2..ec7ad07 100644
--- a/gemini2html.1
+++ b/gemini2html.1
@@ -1,4 +1,4 @@
-.TH GEMINI2HTML "1" "January 2022" "gemini2html v1.1.0"
+.TH GEMINI2HTML "1" "January 2022" "gemini2html v1.2.0"
 .SH NAME
 gemini2html \- convert gemini text to HTML
 .SH SYNOPSIS
diff --git a/src/main.c b/src/main.c
index 228022d..f63fd4b 100644
--- a/src/main.c
+++ b/src/main.c
@@ -23,10 +23,10 @@
 
 #include "gemini2html.h"
 
-#define VERSION "1.1.0"
+#define VERSION "1.2.0"
 
 /* displays the help menu */
-void display_help_text() {
+void display_help_text(char* prog) {
     char* help_text =
         "Convert Gemini files to HTML.\n"
         "\n"
@@ -35,12 +35,12 @@ void display_help_text() {
         "  -v, --version   display program version number then exit\n"
         "\n";
 
-    printf("Usage: gemini2html [OPTION]... < input.gmi > output.html\n%s", help_text);
+    printf("Usage: %s [OPTION]... < input.gmi > output.html\n%s", prog, help_text);
 }
 
 /* displays version information */
-void display_version_text() {
-    printf("gemini2html v%s\n", VERSION);
+void display_version_text(char* prog) {
+    printf("%s v%s\n", prog, VERSION);
 }
 
 /* CLI for gemini2html */
@@ -60,8 +60,8 @@ int main(int argc, char* argv[]) {
         if (c == -1) break;
 
         switch(c) {
-            case 'h': display_help_text(); exit (EXIT_SUCCESS);
-            case 'v': display_version_text(); exit (EXIT_SUCCESS);
+            case 'h': display_help_text(argv[0]); exit (EXIT_SUCCESS);
+            case 'v': display_version_text(argv[0]); exit (EXIT_SUCCESS);
             default: return -1;
         }
     }