From 57bf6fa57619814043ddcca8e55ee69c23316b4e Mon Sep 17 00:00:00 2001
From: Hiltjo Posthuma <hiltjo@codemadness.org>
Date: Fri, 5 Mar 2021 12:44:48 +0100
Subject: [PATCH] change STAGIT_BASEURL to an -u option and also update the
 example script

---
 contrib/example_create.sh       |  2 +-
 contrib/example_post-receive.sh |  2 +-
 man/stagit.1                    | 10 ++++------
 src/stagit.c                    | 10 ++++++----
 4 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/contrib/example_create.sh b/contrib/example_create.sh
index cf16e1d..cbf9c33 100755
--- a/contrib/example_create.sh
+++ b/contrib/example_create.sh
@@ -31,7 +31,7 @@ for dir in "${reposdir}/"*/; do
 
 	mkdir -p "${curdir}/${d}"
 	cd "${curdir}/${d}" || continue
-	stagit -c ".cache" "${reposdir}/${r}"
+	stagit -c ".cache" -u "https://git.codemadness.nl/$d/" "${reposdir}/${r}"
 
 	# symlinks
 	ln -sf log.html index.html
diff --git a/contrib/example_post-receive.sh b/contrib/example_post-receive.sh
index c9bcb5e..5e8d32b 100755
--- a/contrib/example_post-receive.sh
+++ b/contrib/example_post-receive.sh
@@ -64,7 +64,7 @@ fi
 stagit-index "${reposdir}/"*/ > "${destdir}/index.html"
 
 # make pages.
-stagit -c "${cachefile}" "${reposdir}/${r}"
+stagit -c "${cachefile}" -u "https://git.codemadness.nl/$d/" "${reposdir}/${r}"
 
 ln -sf log.html index.html
 ln -sf ../style.css style.css
diff --git a/man/stagit.1 b/man/stagit.1
index d53595f..c449476 100644
--- a/man/stagit.1
+++ b/man/stagit.1
@@ -8,6 +8,7 @@
 .Nm
 .Op Fl c Ar cachefile
 .Op Fl l Ar commits
+.Op Fl u Ar baseurl
 .Ar repodir
 .Sh DESCRIPTION
 .Nm
@@ -31,6 +32,9 @@ Write a maximum number of
 .Ar commits
 to the log.html file only.
 However the commit files are written as usual.
+.It Fl u Ar baseurl
+Base URL to make links in the Atom feeds absolute.
+For example: "https://git.codemadness.org/stagit/".
 .El
 .Pp
 The options
@@ -101,12 +105,6 @@ favicon image.
 .It style.css
 CSS stylesheet.
 .El
-.Sh ENVIRONMENT
-.Bl -tag -width Ds
-.It Ev STAGIT_BASEURL
-Base URL to make links in atom.xml absolute.
-For example: STAGIT_BASE_URL="https://git.codemadness.org/stagit/".
-.El
 .Sh EXIT STATUS
 .Ex -std
 .Sh SEE ALSO
diff --git a/src/stagit.c b/src/stagit.c
index bdf2f70..3375295 100644
--- a/src/stagit.c
+++ b/src/stagit.c
@@ -1195,7 +1195,8 @@ err:
 void
 usage(char *argv0)
 {
-	fprintf(stderr, "%s [-c cachefile | -l commits] repodir\n", argv0);
+	fprintf(stderr, "%s [-c cachefile | -l commits] "
+	        "[-u baseurl] repodir\n", argv0);
 	exit(1);
 }
 
@@ -1228,6 +1229,10 @@ main(int argc, char *argv[])
 			if (argv[i][0] == '\0' || *p != '\0' ||
 			    nlogcommits <= 0 || errno)
 				usage(argv[0]);
+		} else if (argv[i][1] == 'u') {
+			if (i + 1 >= argc)
+				usage(argv[0]);
+			baseurl = argv[++i];
 		}
 	}
 	if (!repodir)
@@ -1255,9 +1260,6 @@ main(int argc, char *argv[])
 	}
 #endif
 
-	if ((p = getenv("STAGIT_BASEURL")))
-		baseurl = p;
-
 	if (git_repository_open_ext(&repo, repodir,
 		GIT_REPOSITORY_OPEN_NO_SEARCH, NULL) < 0) {
 		fprintf(stderr, "%s: cannot open repository\n", argv[0]);
-- 
2.39.2