commit 5ced189f1993fc17ae683f0a542218db7be7267b
parent 7968c0bc9c0172bd654e1f87d8194aef7fb69865
Author: Hiltjo Posthuma <hiltjo@codemadness.org>
Date: Fri, 5 Mar 2021 12:44:48 +0100
parent 7968c0bc9c0172bd654e1f87d8194aef7fb69865
Author: Hiltjo Posthuma <hiltjo@codemadness.org>
Date: Fri, 5 Mar 2021 12:44:48 +0100
change STAGIT_BASEURL to an -u option and also update the example script
4 files changed, 13 insertions(+), 13 deletions(-)
diff --git a/example_create.sh b/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/example_post-receive.sh b/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/stagit.1 b/stagit.1 @@ -1,4 +1,4 @@ -.Dd March 4, 2021 +.Dd March 5, 2021 .Dt STAGIT 1 .Os .Sh NAME @@ -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 @@ -103,12 +107,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/stagit.c b/stagit.c @@ -1125,7 +1125,8 @@ writerefs(FILE *fp) 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); } @@ -1158,6 +1159,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) @@ -1185,9 +1190,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]);