diff --git a/.gitignore b/.gitignore index ee0122e..13ff559 100644 --- a/.gitignore +++ b/.gitignore @@ -1,5 +1,4 @@ /untitled/ /id_oauth2_bearer -/index.html /lighttpd.conf /website.tar.gz diff --git a/Makefile b/Makefile index c4ab077..5e7bda8 100644 --- a/Makefile +++ b/Makefile @@ -12,7 +12,7 @@ # # You should have received a copy of the GNU General Public License # along with this program. If not, see . -DOMAIN := gnutoo.srht.site +DOMAIN := libreboot.srht.site .PHONY: all build help upload website.tar.gz @@ -62,12 +62,8 @@ upload: website.tar.gz -Fcontent=@website.tar.gz \ https://pages.sr.ht/publish/$(DOMAIN) -index.html: index.html.tmpl - sed 's/DOMAIN/$(DOMAIN)/' $? > $@ - # See https://reproducible-builds.org/docs/archives/ for more details -website.tar.gz: build index.html - sed 's/DOMAIN/$(DOMAIN)/' index.html.tmpl > index.html +website.tar.gz: build tar \ --exclude-vcs \ --format=gnu \ @@ -77,6 +73,5 @@ website.tar.gz: build index.html -czf \ website.tar.gz \ untitled/www/ \ - index.html \ - --transform="s#untitled/www/lbwww/site/#libreboot/#" \ - --transform="s#untitled/www/lbwww-img/www/#libreboot/img/#" + --transform="s#untitled/www/lbwww/site/##" \ + --transform="s#untitled/www/lbwww-img/www/#img/#" diff --git a/build.sh b/build.sh index 81eb1d7..dbda770 100755 --- a/build.sh +++ b/build.sh @@ -17,7 +17,7 @@ set -e if [ ! -d untitled ] ; then - git clone https://git.sr.ht/~gnutoo/untitled + git clone https://git.sr.ht/~libreboot/untitled else git -C untitled clean -dfx git -C untitled pull --rebase @@ -26,14 +26,14 @@ fi cd untitled && mkdir -p www && cd www if [ ! -d lbwww ] ; then - git clone https://git.sr.ht/~gnutoo/lbwww + git clone https://git.sr.ht/~libreboot/lbwww else git -C lbwww clean -dfx git -C lbwww pull --rebase fi if [ ! -d lbwww-img ] ; then - git clone https://git.sr.ht/~gnutoo/lbwww-img + git clone https://git.sr.ht/~libreboot/lbwww-img else git -C lbwww-img clean -dfx git -C lbwww-img pull --rebase diff --git a/index.html.tmpl b/index.html.tmpl deleted file mode 100644 index 067de8b..0000000 --- a/index.html.tmpl +++ /dev/null @@ -1,29 +0,0 @@ - - - - - DOMAIN - - - -

Websites:

- - -