diff --git a/authors.html b/authors.html
index 39a6c638b..69ff4a35f 100644
--- a/authors.html
+++ b/authors.html
@@ -433,7 +433,7 @@ Jump to authors sorted by: [
Location: CZ - Czechia
-author_handle: Ondrej_Adamovsky
+author_handle: Ondrej_Adamovsky
@@ -448,7 +448,7 @@ author_handle: SE - Sweden
-author_handle: Anton_Algmyr
+author_handle: Anton_Algmyr
@@ -463,7 +463,7 @@ author_handle: US - United States
-author_handle: Derek_Anderson
+author_handle: Derek_Anderson
@@ -478,7 +478,7 @@ author_handle: ID - Indonesia
-author_handle: Glyn_Anderson
+author_handle: Glyn_Anderson
@@ -493,7 +493,7 @@ author_handle: US - United States
-author_handle: Anonymous_1984
+author_handle: Anonymous_1984
@@ -508,7 +508,7 @@ author_handle: GB - United Kingdom
-author_handle: Anonymous_2001
+author_handle: Anonymous_2001
@@ -525,7 +525,7 @@ Location: SG - Singapore
URL: https://web.archive.org/web/20040324155828/http://bicoherent.topcities.com/
-author_handle: Anonymous_2004
+author_handle: Anonymous_2004
@@ -540,7 +540,7 @@ author_handle: ZZ - Unknown location
-author_handle: Anonymous_2005
+author_handle: Anonymous_2005
@@ -555,7 +555,7 @@ author_handle: JP - Japan
-author_handle: Anonymous_2015
+author_handle: Anonymous_2015
@@ -572,7 +572,7 @@ Location: US - United States
URL: http://www.crpc.rice.edu/CRPC/newsletters/win00/pp_applegate.html
-author_handle: David_Applegate
+author_handle: David_Applegate
@@ -589,7 +589,7 @@ Location: US - United States
URL: https://www.cs.colostate.edu/~applin/
-author_handle: Jack_Applin
+author_handle: Jack_Applin
@@ -608,7 +608,7 @@ Location: SE - Sweden
URL: https://www.arkko.com
-author_handle: Jari_Arkko
+author_handle: Jari_Arkko
@@ -625,7 +625,7 @@ author_handle: US - United States
-author_handle: Michael_Ash
+author_handle: Michael_Ash
@@ -642,7 +642,7 @@ Location: SE - Sweden
URL: https://web.archive.org/web/20090831055828/http://www.cs.chalmers.se/~augustss
-author_handle: Lennart_Augustsson
+author_handle: Lennart_Augustsson
@@ -666,7 +666,7 @@ author_handle: NL - Netherlands
-author_handle: Bas_de_Bakker
+author_handle: Bas_de_Bakker
@@ -686,7 +686,7 @@ URL: https://blog.aerojocke
Alternate URL: https://blog.aerojockey.com/post/iocccsim
-author_handle: Carl_Banks
+author_handle: Carl_Banks
@@ -701,7 +701,7 @@ author_handle: UK - United Kingdom
-author_handle: Gavin_Barraclough
+author_handle: Gavin_Barraclough
@@ -718,7 +718,7 @@ Location: US - United States
URL: https://web.archive.org/web/20020724233128/http://www.theworld.com/~buzzard/
-author_handle: Sean_Barrett
+author_handle: Sean_Barrett
@@ -735,7 +735,7 @@ author_handle: US - United States
-author_handle: Doug_Beardsley
+author_handle: Doug_Beardsley
@@ -752,7 +752,7 @@ Location: FR - France
URL: https://bellard.org
-author_handle: Fabrice_Bellard
+author_handle: Fabrice_Bellard
@@ -769,7 +769,7 @@ author_handle: US - United States
-author_handle: E_Jay_Berkenbilt
+author_handle: E_Jay_Berkenbilt
@@ -786,7 +786,7 @@ Location: US - United States
URL: https://cr.yp.to/djb.html
-author_handle: Daniel_J_Bernstein
+author_handle: Daniel_J_Bernstein
@@ -803,7 +803,7 @@ Location: US - United States
URL: https://web.archive.org/web/19981212023216/http://www.biggar.org/
-author_handle: Mark_Biggar
+author_handle: Mark_Biggar
@@ -820,7 +820,7 @@ Location: US - United States
URL: https://meatfighter.com
-author_handle: Michael_Birken
+author_handle: Michael_Birken
@@ -839,7 +839,7 @@ Location: US - United States
URL: https://www.nist.gov/people/paul-e-black
-author_handle: Paul_E_Black
+author_handle: Paul_E_Black
@@ -854,7 +854,7 @@ author_handle: GB - United Kingdom
-author_handle: Philip_Blakely
+author_handle: Philip_Blakely
@@ -870,7 +870,7 @@ author_handle: GB - United Kingdom
-author_handle: James_Bonfield
+author_handle: James_Bonfield
@@ -887,7 +887,7 @@ author_handle: DE - Germany
-author_handle: Szabolcs_Borsanyi
+author_handle: Szabolcs_Borsanyi
@@ -903,7 +903,7 @@ author_handle: FR - France
-author_handle: Francois_Boutines
+author_handle: Francois_Boutines
@@ -920,7 +920,7 @@ Location: US - United States
URL: https://web.archive.org/web/20000919041057/http://east.isx.com/~vanb/
-author_handle: David_Van_Brackle
+author_handle: David_Van_Brackle
@@ -937,7 +937,7 @@ author_handle: US - United States
-author_handle: Moxen_N_Briddlebane
+author_handle: Moxen_N_Briddlebane
@@ -956,7 +956,7 @@ URL: https://www.walterbri
GitHub: @WalterBright
-author_handle: Walter_Bright
+author_handle: Walter_Bright
@@ -973,7 +973,7 @@ Location: US - United States
URL: https://www.mailcom.com/main.shtml
-author_handle: Leonid_A_Broukhis
+author_handle: Leonid_A_Broukhis
@@ -989,7 +989,7 @@ author_handle: JP - Japan
-author_handle: Bsoup
+author_handle: Bsoup
@@ -1006,7 +1006,7 @@ Location: US - United States
URL: https://web.archive.org/web/19970619001904/http://www.netspace.org/users/ldb/
-author_handle: Laurion_Burchall
+author_handle: Laurion_Burchall
@@ -1021,7 +1021,7 @@ author_handle: US - United States
-author_handle: Brent_Burley
+author_handle: Brent_Burley
@@ -1040,7 +1040,7 @@ URL: http://ioccc.snox.net
Alternate URL: https://snox.net/ioccc/
-author_handle: Dave_Burton
+author_handle: Dave_Burton
@@ -1059,7 +1059,7 @@ author_handle: UK - United Kingdom
-author_handle: Gavin_Buttimore
+author_handle: Gavin_Buttimore
@@ -1081,7 +1081,7 @@ author_handle: US - United States
-author_handle: Adrian_Cable
+author_handle: Adrian_Cable
@@ -1102,7 +1102,7 @@ URL: https://nicholas.carl
GitHub: @carlini
-author_handle: Nicholas_Carlini
+author_handle: Nicholas_Carlini
@@ -1119,7 +1119,7 @@ Location: US - United States
URL: http://www.raymondcheong.com/index.html
-author_handle: Raymond_Cheong
+author_handle: Raymond_Cheong
@@ -1135,7 +1135,7 @@ author_handle: SG - Singapore
-author_handle: V_Chia
+author_handle: V_Chia
@@ -1150,7 +1150,7 @@ author_handle: PL - Poland
-author_handle: Marcin_Ciura
+author_handle: Marcin_Ciura
@@ -1168,7 +1168,7 @@ Location: GB - United Kingdom<
URL: https://www.cs.ox.ac.uk/people/ian.collier/
-author_handle: Ian_Collier
+author_handle: Ian_Collier
@@ -1184,7 +1184,7 @@ author_handle: US - United States
-author_handle: Pierre-Philippe_Coupard
+author_handle: Pierre-Philippe_Coupard
@@ -1208,7 +1208,7 @@ Location: US - United States
URL: https://jpdalbec.people.ysu.edu
-author_handle: John_Dalbec
+author_handle: John_Dalbec
@@ -1224,7 +1224,7 @@ author_handle: AU - Australia
-author_handle: Paul_Dale
+author_handle: Paul_Dale
@@ -1239,7 +1239,7 @@ author_handle: ZZ - Unknown location
-author_handle: Ferenc_Deak
+author_handle: Ferenc_Deak
@@ -1254,7 +1254,7 @@ author_handle: BE - Belgium
-author_handle: Alex_Deckmyn
+author_handle: Alex_Deckmyn
@@ -1271,7 +1271,7 @@ Location: US - United States
URL: https://www.linkedin.com/in/dave-decot-a8715a45/
-author_handle: Dave_Decot
+author_handle: Dave_Decot
@@ -1288,7 +1288,7 @@ Location: PL - Poland
URL: https://sun.aei.polsl.pl/~sdeor/
-author_handle: Sebastian_Deorowicz
+author_handle: Sebastian_Deorowicz
@@ -1305,7 +1305,7 @@ Location: DE - Germany
URL: https://njh.eu
-author_handle: Volker_Diels-Grabsch
+author_handle: Volker_Diels-Grabsch
@@ -1323,7 +1323,7 @@ Location: US - United States
URL: https://web.archive.org/web/20000816152741/http://www.neta.com/~dodson/
-author_handle: Don_Dodson
+author_handle: Don_Dodson
@@ -1341,7 +1341,7 @@ author_handle: IL - Israel
-author_handle: Gil_Dogon
+author_handle: Gil_Dogon
@@ -1358,7 +1358,7 @@ author_handle: NL - Netherlands
-author_handle: Frans_van_Dorsselaer
+author_handle: Frans_van_Dorsselaer
@@ -1373,7 +1373,7 @@ author_handle: US - United States
-author_handle: Sean_Dorward
+author_handle: Sean_Dorward
@@ -1390,7 +1390,7 @@ Location: US - United States
URL: https://web.archive.org/web/19961019045145/http://www.bungalow.com/
-author_handle: Heather_Downs
+author_handle: Heather_Downs
@@ -1406,7 +1406,7 @@ author_handle: PT - Portugal
-author_handle: Carlos_Duarte
+author_handle: Carlos_Duarte
@@ -1423,7 +1423,7 @@ Location: FR - France
URL: https://lig-membres.imag.fr/duble/
-author_handle: Etienne_Duble
+author_handle: Etienne_Duble
@@ -1439,7 +1439,7 @@ author_handle: FR - France
-author_handle: Christian_Dupont
+author_handle: Christian_Dupont
@@ -1461,7 +1461,7 @@ author_handle: US - United States
-author_handle: Peter_Eastman
+author_handle: Peter_Eastman
@@ -1476,7 +1476,7 @@ author_handle: US - United States
-author_handle: Paul_Eggert
+author_handle: Paul_Eggert
@@ -1491,7 +1491,7 @@ author_handle: NO - Norway
-author_handle: Thor_Eldby
+author_handle: Thor_Eldby
@@ -1512,7 +1512,7 @@ Mastodon: @mame
-author_handle: Yusuke_Endoh
+author_handle: Yusuke_Endoh
@@ -1559,7 +1559,7 @@ Mastodon: @xexyl
-author_handle: Cody_Boone_Ferguson
+author_handle: Cody_Boone_Ferguson
@@ -1582,7 +1582,7 @@ Mastodon: @fanf2
-author_handle: Tony_Finch
+author_handle: Tony_Finch
@@ -1601,7 +1601,7 @@ URL: http://hea-www.h
Mastodon: @thomasafine@social.linux.pizza
-author_handle: Thomas_A_Fine
+author_handle: Thomas_A_Fine
@@ -1616,7 +1616,7 @@ author_handle: US - United States
-author_handle: Daniel_Fischer
+author_handle: Daniel_Fischer
@@ -1631,7 +1631,7 @@ author_handle: US - United States
-author_handle: Karl_F_Fox
+author_handle: Karl_F_Fox
@@ -1646,7 +1646,7 @@ author_handle: FI - Finland
-author_handle: Kimmo_Fredriksson
+author_handle: Kimmo_Fredriksson
@@ -1663,7 +1663,7 @@ Location: GB - United Kingdom<
URL: https://web.archive.org/web/20151022221359/http://thad.notagoth.org/
-author_handle: Thaddaeus_Frogley
+author_handle: Thaddaeus_Frogley
@@ -1687,7 +1687,7 @@ Location: SE - Sweden
URL: https://gavare.se
-author_handle: Anders_Gavare
+author_handle: Anders_Gavare
@@ -1702,7 +1702,7 @@ author_handle: ZA - South Africa
-author_handle: David_Gibson
+author_handle: David_Gibson
@@ -1721,7 +1721,7 @@ URL: https://id523a.com
GitHub: @id523a
-author_handle: Edward_Giles
+author_handle: Edward_Giles
@@ -1740,7 +1740,7 @@ Location: DE - Germany
URL: https://web.archive.org/web/20011221120305/http://insider.regio.net/~garry/
-author_handle: Garry_Glendown
+author_handle: Garry_Glendown
@@ -1755,7 +1755,7 @@ author_handle: US - United States
-author_handle: David_Goodenough
+author_handle: David_Goodenough
@@ -1770,7 +1770,7 @@ author_handle: IL - Israel
-author_handle: Uri_Goren
+author_handle: Uri_Goren
@@ -1785,7 +1785,7 @@ author_handle: US - United States
-author_handle: Aaron_Grothe
+author_handle: Aaron_Grothe
@@ -1803,7 +1803,7 @@ Location: FI - Finland
URL: https://www.gson.org
-author_handle: Andreas_Gustafsson
+author_handle: Andreas_Gustafsson
@@ -1827,7 +1827,7 @@ Location: GB - United Kingdom<
URL: https://web.archive.org/web/19991003012715/http://www.oxinet.co.uk/jim/
-author_handle: Jim_Hague
+author_handle: Jim_Hague
@@ -1842,7 +1842,7 @@ author_handle: JP - Japan
-author_handle: Shinichiro_Hamaji
+author_handle: Shinichiro_Hamaji
@@ -1857,7 +1857,7 @@ author_handle: JP - Japan
-author_handle: Tsukasa_Hamano
+author_handle: Tsukasa_Hamano
@@ -1872,7 +1872,7 @@ author_handle: NO - Norway
-author_handle: Steinar_Hamre
+author_handle: Steinar_Hamre
@@ -1889,7 +1889,7 @@ Location: US - United States
URL: https://www.cs.cmu.edu/~ph/
-author_handle: Paul_Heckbert
+author_handle: Paul_Heckbert
@@ -1906,7 +1906,7 @@ Location: US - United States
URL: http://marvin.cs.uidaho.edu
-author_handle: Robert_Heckendorn
+author_handle: Robert_Heckendorn
@@ -1921,7 +1921,7 @@ author_handle: DE - Germany
-author_handle: Arne_Heizmann
+author_handle: Arne_Heizmann
@@ -1938,7 +1938,7 @@ Location: NO - Norway
URL: https://www.pvv.ntnu.no/~stig/
-author_handle: Stig_Hemmer
+author_handle: Stig_Hemmer
@@ -1955,7 +1955,7 @@ Location: DE - Germany
URL: https://web.archive.org/web/20071018081145/http://pcpool.mathematik.uni-freiburg.de/~immi/
-author_handle: Immanuel_Herrmann
+author_handle: Immanuel_Herrmann
@@ -1971,7 +1971,7 @@ author_handle: US - United States
-author_handle: Spencer_Hines
+author_handle: Spencer_Hines
@@ -1986,7 +1986,7 @@ author_handle: US - United States
-author_handle: Bruce_Holloway
+author_handle: Bruce_Holloway
@@ -2003,7 +2003,7 @@ Location: FI - Finland
URL: https://web.archive.org/web/20061205082106/http://personal.eunet.fi/pp/halo/
-author_handle: Jyrki_Holopainen
+author_handle: Jyrki_Holopainen
@@ -2021,7 +2021,7 @@ Location: NL - Netherlands
URL: https://home.hccnet.nl/a.w.m.van.der.horst/
-author_handle: Albert_van_der_Horst
+author_handle: Albert_van_der_Horst
@@ -2038,7 +2038,7 @@ Location: US - United States
URL: https://maryannhorton.com
-author_handle: Mary_Ann_Horton
+author_handle: Mary_Ann_Horton
@@ -2053,7 +2053,7 @@ author_handle: CN - China
-author_handle: Qiming_HOU
+author_handle: Qiming_HOU
@@ -2074,7 +2074,7 @@ Location: CA - Canada
URL: http://www.snert.com
-author_handle: Anthony_C_Howe
+author_handle: Anthony_C_Howe
@@ -2096,7 +2096,7 @@ Location: US - United States
URL: http://www.jonhoyle.com
-author_handle: Jonathan_Hoyle
+author_handle: Jonathan_Hoyle
@@ -2113,7 +2113,7 @@ Location: US - United States
URL: https://www.huffmancoding.com
-author_handle: Ken_Huffman
+author_handle: Ken_Huffman
@@ -2135,7 +2135,7 @@ author_handle: US - United States
-author_handle: Mark_Isaak
+author_handle: Mark_Isaak
@@ -2159,7 +2159,7 @@ Location: NL - Netherlands
URL: https://web.archive.org/web/20010720192926/http://tomx.tripod.com/
-author_handle: Thomas_P_John
+author_handle: Thomas_P_John
@@ -2176,7 +2176,7 @@ Location: NZ - New Zealand
URL: https://web.archive.org/web/20051030162356/http://www.notdot.net/
-author_handle: Nick_Johnson
+author_handle: Nick_Johnson
@@ -2191,7 +2191,7 @@ author_handle: US - United States
-author_handle: Larry_Jones
+author_handle: Larry_Jones
@@ -2215,7 +2215,7 @@ Location: KR - South Korea
URL: https://mearie.org
-author_handle: Seonghoon_Kang
+author_handle: Seonghoon_Kang
@@ -2230,7 +2230,7 @@ author_handle: US - United States
-author_handle: Joshua_Karns
+author_handle: Joshua_Karns
@@ -2245,7 +2245,7 @@ author_handle: US - United States
-author_handle: Chris_King
+author_handle: Chris_King
@@ -2262,7 +2262,7 @@ Location: FI - Finland
URL: https://kivinen.iki.fi
-author_handle: Tero_Kivinen
+author_handle: Tero_Kivinen
@@ -2277,7 +2277,7 @@ author_handle: US - United States
-author_handle: Peter_Klausler
+author_handle: Peter_Klausler
@@ -2292,7 +2292,7 @@ author_handle: JP - Japan
-author_handle: Taketo_Konno
+author_handle: Taketo_Konno
@@ -2310,7 +2310,7 @@ Location: PL - Poland
URL: https://www.mimuw.edu.pl/~erykk/
-author_handle: Eryk_Kopczynski
+author_handle: Eryk_Kopczynski
@@ -2329,7 +2329,7 @@ URL: http://www.kornshel
Alternate URL: https://www.linkedin.com/in/david-korn-b23185/
-author_handle: David_Korn
+author_handle: David_Korn
@@ -2348,7 +2348,7 @@ URL: https://github.co
GitHub: @ilyakurdyukov
-author_handle: Ilya_Kurdyukov
+author_handle: Ilya_Kurdyukov
@@ -2373,7 +2373,7 @@ author_handle: ZZ - Unknown location
-author_handle: Mike_Laman
+author_handle: Mike_Laman
@@ -2394,7 +2394,7 @@ Alternate URL:
Mastodon: @ora@w3c.social
-author_handle: Ora_Lassila
+author_handle: Ora_Lassila
@@ -2411,7 +2411,7 @@ Location: FI - Finland
URL: https://jet.ro
-author_handle: Jetro_Lauha
+author_handle: Jetro_Lauha
@@ -2426,7 +2426,7 @@ author_handle: NL - Netherlands
-author_handle: Roemer_B_Lievaart
+author_handle: Roemer_B_Lievaart
@@ -2442,7 +2442,7 @@ author_handle: CH - Switzerland
-author_handle: Maarten_Litmaath
+author_handle: Maarten_Litmaath
@@ -2461,7 +2461,7 @@ URL: https://github.com/dlowe<
GitHub: @dlowe
-author_handle: J_David_Lowe
+author_handle: J_David_Lowe
@@ -2481,7 +2481,7 @@ author_handle: CH - Switzerland
-author_handle: Oskar_von_der_Luehe
+author_handle: Oskar_von_der_Luehe
@@ -2498,7 +2498,7 @@ Location: US - United States
URL: https://web.cse.msstate.edu/~luke/
-author_handle: Ed_Luke
+author_handle: Ed_Luke
@@ -2513,7 +2513,7 @@ author_handle: ZZ - Unknown location
-author_handle: Ed_Lycklama
+author_handle: Ed_Lycklama
@@ -2530,7 +2530,7 @@ Location: US - United States
URL: https://crypto.stanford.edu/~blynn/
-author_handle: Ben_Lynn
+author_handle: Ben_Lynn
@@ -2554,7 +2554,7 @@ Location: FR - France
URL: http://www.madore.org/~david/
-author_handle: David_Madore
+author_handle: David_Madore
@@ -2571,7 +2571,7 @@ Location: IT - Italy
URL: https://web.archive.org/web/20170706135649/http://www.assezeta.com/sandromaffiodo/
-author_handle: Sandro_Maffiodo
+author_handle: Sandro_Maffiodo
@@ -2589,7 +2589,7 @@ Location: US - United States
URL: https://web.archive.org/web/19961019045145/http://www.bungalow.com/
-author_handle: Selene_Makarios
+author_handle: Selene_Makarios
@@ -2607,7 +2607,7 @@ Location: IT - Italy
URL: https://www.andreamarangoni.it
-author_handle: Andrea_Marangoni
+author_handle: Andrea_Marangoni
@@ -2622,7 +2622,7 @@ author_handle: US - United States
-author_handle: Adrian_Mariano
+author_handle: Adrian_Mariano
@@ -2638,7 +2638,7 @@ author_handle: US - United States
-author_handle: Eric_Marshall
+author_handle: Eric_Marshall
@@ -2653,7 +2653,7 @@ author_handle: US - United States
-author_handle: Ron_McFarland
+author_handle: Ron_McFarland
@@ -2670,7 +2670,7 @@ Location: AU - Australia
URL: https://web.archive.org/web/20030212213342/http://byron.csse.monash.edu.au/realindex.html
-author_handle: Bernd_Meyer
+author_handle: Bernd_Meyer
@@ -2685,7 +2685,7 @@ author_handle: US - United States
-author_handle: Raphael_Meyer
+author_handle: Raphael_Meyer
@@ -2700,7 +2700,7 @@ author_handle: US - United States
-author_handle: Christopher_Mills
+author_handle: Christopher_Mills
@@ -2721,7 +2721,7 @@ author_handle: US - United States
-author_handle: Neil_Mix
+author_handle: Neil_Mix
@@ -2736,7 +2736,7 @@ author_handle: IT - Italy
-author_handle: Maurizio_Monge
+author_handle: Maurizio_Monge
@@ -2751,7 +2751,7 @@ author_handle: FR - France
-author_handle: Yves-Marie_Morgan
+author_handle: Yves-Marie_Morgan
@@ -2772,7 +2772,7 @@ URL: https://github.
GitHub: @sjoerdmullender
-author_handle: Sjoerd_Mullender
+author_handle: Sjoerd_Mullender
@@ -2787,7 +2787,7 @@ author_handle: DE - Germany
-author_handle: Dominik_Muth
+author_handle: Dominik_Muth
@@ -2809,7 +2809,7 @@ author_handle: US - United States
-author_handle: Jeff_Newbern
+author_handle: Jeff_Newbern
@@ -2826,7 +2826,7 @@ Location: US - United States
URL: https://web.archive.org/web/20090415070532/https://www.people.fas.harvard.edu/~night/
-author_handle: Christopher_Night
+author_handle: Christopher_Night
@@ -2841,7 +2841,7 @@ author_handle: IL - Israel
-author_handle: Baruch_Nissenbaum
+author_handle: Baruch_Nissenbaum
@@ -2858,7 +2858,7 @@ Location: FI - Finland
URL: https://www.cs.hut.fi/~enu/
-author_handle: Esko_Nuutila
+author_handle: Esko_Nuutila
@@ -2882,7 +2882,7 @@ Location: FR - France
URL: https://www.univ-orleans.fr/lifo/Members/Nicolas.Ollinger/
-author_handle: Nicolas_Ollinger
+author_handle: Nicolas_Ollinger
@@ -2899,7 +2899,7 @@ Location: US - United States
URL: http://jorendorff.blogspot.com
-author_handle: Jason_Orendorff
+author_handle: Jason_Orendorff
@@ -2914,7 +2914,7 @@ author_handle: IL - Israel
-author_handle: Doron_Osovlanski
+author_handle: Doron_Osovlanski
@@ -2935,7 +2935,7 @@ Alternate URL: @yalue
-author_handle: Nathan_Otterness
+author_handle: Nathan_Otterness
@@ -2957,7 +2957,7 @@ author_handle: US - United States
-author_handle: Michael_H_Pawka
+author_handle: Michael_H_Pawka
@@ -2972,7 +2972,7 @@ author_handle: US - United States
-author_handle: Vern_Paxson
+author_handle: Vern_Paxson
@@ -2987,7 +2987,7 @@ author_handle: BR - Brazil
-author_handle: Mauro_Persano
+author_handle: Mauro_Persano
@@ -3002,7 +3002,7 @@ author_handle: UK - United Kingdom
-author_handle: Ian_Phillipps
+author_handle: Ian_Phillipps
@@ -3019,7 +3019,7 @@ Location: US - United States
URL: https://web.archive.org/web/20081002081033/http://www.nrgnet.com/markus/
-author_handle: Mark_Plummer
+author_handle: Mark_Plummer
@@ -3036,7 +3036,7 @@ Location: FI - Finland
URL: https://ig.fi/other/ioccc
-author_handle: Timo_Poikola
+author_handle: Timo_Poikola
@@ -3056,7 +3056,7 @@ URL: https://github.com/sans
GitHub: @sans17
-author_handle: Alexander_Prishchepov
+author_handle: Alexander_Prishchepov
@@ -3075,7 +3075,7 @@ URL: //www.kev.pulo.com.au/
Mastodon: @devkev@fosstodon.org
-author_handle: Kevin_Pulo
+author_handle: Kevin_Pulo
@@ -3107,7 +3107,7 @@ URL: https://www.rakitzis.com<
Alternate URL: https://www.linkedin.com/in/byron-rakitzis-b2b3304/
-author_handle: Byron_Rakitzis
+author_handle: Byron_Rakitzis
@@ -3124,7 +3124,7 @@ Location: FI - Finland
URL: https://www.cs.hut.fi/~tvr/
-author_handle: Teemu_Rantanen
+author_handle: Teemu_Rantanen
@@ -3139,7 +3139,7 @@ author_handle: US - United States
-author_handle: Gopi_Reddy
+author_handle: Gopi_Reddy
@@ -3156,7 +3156,7 @@ Location: US - United States
URL: https://www.cs.cornell.edu/home/rvr/
-author_handle: Robbert_van_Renesse
+author_handle: Robbert_van_Renesse
@@ -3171,7 +3171,7 @@ author_handle: US - United States
-author_handle: Gregor_Richards
+author_handle: Gregor_Richards
@@ -3186,7 +3186,7 @@ author_handle: US - United States
-author_handle: Arch_D_Robison
+author_handle: Arch_D_Robison
@@ -3206,7 +3206,7 @@ Location: GB - United Kingdom<
URL: https://www.edwardrosten.com
-author_handle: Edward_Rosten
+author_handle: Edward_Rosten
@@ -3223,7 +3223,7 @@ Location: GB - United Kingdom<
URL: https://web.archive.org/web/20041128214304/http://www.softbase.co.uk/
-author_handle: Peter_J_Ruczynski
+author_handle: Peter_J_Ruczynski
@@ -3242,7 +3242,7 @@ URL: https://www.cs.
Alternate URL: http://www-leland.stanford.edu/~smr
-author_handle: Szymon_Rusinkiewicz
+author_handle: Szymon_Rusinkiewicz
@@ -3266,7 +3266,7 @@ Location: US - United States
URL: https://web.archive.org/web/20010721133712/http://www.geocities.com/SouthBeach/Marina/5775/
-author_handle: Michael_Savastio
+author_handle: Michael_Savastio
@@ -3281,7 +3281,7 @@ author_handle: US - United States
-author_handle: Craig_Schneiderwent
+author_handle: Craig_Schneiderwent
@@ -3296,7 +3296,7 @@ author_handle: US - United States
-author_handle: Mark_Schnitzius
+author_handle: Mark_Schnitzius
@@ -3318,7 +3318,7 @@ Location: DE - Germany
URL: http://www.schweikhardt.net
-author_handle: Jens_Schweikhardt
+author_handle: Jens_Schweikhardt
@@ -3340,7 +3340,7 @@ author_handle: US - United States
-author_handle: Andrew_Shapiro
+author_handle: Andrew_Shapiro
@@ -3355,7 +3355,7 @@ author_handle: US - United States
-author_handle: Carl_Shapiro
+author_handle: Carl_Shapiro
@@ -3370,7 +3370,7 @@ author_handle: JP - Japan
-author_handle: NATORI_Shin
+author_handle: NATORI_Shin
@@ -3387,7 +3387,7 @@ Location: US - United States
URL: https://sicherman.net
-author_handle: Col_G_L_Sicherman
+author_handle: Col_G_L_Sicherman
@@ -3402,7 +3402,7 @@ author_handle: GB - United Kingdom
-author_handle: Nathan_Sidwell
+author_handle: Nathan_Sidwell
@@ -3421,7 +3421,7 @@ URL: https://celskeggs.com
GitHub: @celskeggs
-author_handle: Cel_Skeggs
+author_handle: Cel_Skeggs
@@ -3436,7 +3436,7 @@ author_handle: US - United States
-author_handle: Andy_Sloane
+author_handle: Andy_Sloane
@@ -3453,7 +3453,7 @@ Location: US - United States
URL: http://www.highprogrammer.com/alan/
-author_handle: Alan_De_Smet
+author_handle: Alan_De_Smet
@@ -3474,7 +3474,7 @@ Mastodon:
GitHub: @dspinellis
-author_handle: Diomidis_Spinellis
+author_handle: Diomidis_Spinellis
@@ -3492,7 +3492,7 @@ author_handle: ZZ - Unknown location
-author_handle: Jan_Stein
+author_handle: Jan_Stein
@@ -3507,7 +3507,7 @@ author_handle: US - United States
-author_handle: Thomas_Stewart
+author_handle: Thomas_Stewart
@@ -3522,7 +3522,7 @@ author_handle: UK - United Kingdom
-author_handle: Dean_Swift
+author_handle: Dean_Swift
@@ -3539,7 +3539,7 @@ Location: FI - Finland
URL: https://web.archive.org/web/20160316092728/http://www.stephensykes.com/
-author_handle: Stephen_Sykes
+author_handle: Stephen_Sykes
@@ -3564,7 +3564,7 @@ author_handle: NO - Norway
-author_handle: Jon_Thingvold
+author_handle: Jon_Thingvold
@@ -3580,7 +3580,7 @@ author_handle: GB - United Kingdom
-author_handle: Aidan_Thornton
+author_handle: Aidan_Thornton
@@ -3597,7 +3597,7 @@ Location: MX - Mexico
URL: https://nanochess.org/
-author_handle: Oscar_Toledo
+author_handle: Oscar_Toledo
@@ -3618,7 +3618,7 @@ Location: BE - Belgium
URL: https://web.archive.org/web/20010520021948/http://members.nbci.com/tomtorfs/
-author_handle: Tom_Torfs
+author_handle: Tom_Torfs
@@ -3637,7 +3637,7 @@ URL: https://tromp.github.io
GitHub: @tromp
-author_handle: John_Tromp
+author_handle: John_Tromp
@@ -3657,7 +3657,7 @@ URL: https://gitlab.com/tsoj
GitHub: @tsoj
-author_handle: Tsoj
+author_handle: Tsoj
@@ -3687,7 +3687,7 @@ Location: US - United States
URL: https://www.vik.cc
-author_handle: Daniel_Vik
+author_handle: Daniel_Vik
@@ -3707,7 +3707,7 @@ author_handle: US - United States
-author_handle: Scott_Vokes
+author_handle: Scott_Vokes
@@ -3722,7 +3722,7 @@ author_handle: US - United States
-author_handle: Jay_Vosburgh
+author_handle: Jay_Vosburgh
@@ -3746,7 +3746,7 @@ Location: US - United States
URL: http://www.wall.org/~larry/
-author_handle: Larry_Wall
+author_handle: Larry_Wall
@@ -3764,7 +3764,7 @@ Location: US - United States
URL: http://www.deater.net/weave/
-author_handle: Vincent_Weaver
+author_handle: Vincent_Weaver
@@ -3781,7 +3781,7 @@ Location: US - United States
URL: https://web.archive.org/web/20050424020506/http://www.op.net/~jaw
-author_handle: Jeff_Weisberg
+author_handle: Jeff_Weisberg
@@ -3798,7 +3798,7 @@ Location: US - United States
URL: http://www.westley.org
-author_handle: Brian_Westley
+author_handle: Brian_Westley
@@ -3821,7 +3821,7 @@ author_handle: NL - Netherlands
-author_handle: Freek_Wiedijk
+author_handle: Freek_Wiedijk
@@ -3836,7 +3836,7 @@ author_handle: US - United States
-author_handle: John_Williams
+author_handle: John_Williams
@@ -3851,7 +3851,7 @@ author_handle: US - United States
-author_handle: James_A_Woods
+author_handle: James_A_Woods
@@ -3881,7 +3881,7 @@ Location: US - United States
URL: https://uguu.org
-author_handle: Don_Yang
+author_handle: Don_Yang
@@ -3912,7 +3912,7 @@ author_handle: US - United States
-author_handle: Lord_Zarbon
+author_handle: Lord_Zarbon
@@ -3927,7 +3927,7 @@ author_handle: IL - Israel
-author_handle: Adar_Zeitak
+author_handle: Adar_Zeitak
@@ -3944,7 +3944,7 @@ Location: US - United States
URL: https://mzucker.github.io/swarthmore/
-author_handle: Matt_Zucker
+author_handle: Matt_Zucker
diff --git a/bin/add-dir.sh b/bin/add-dir.sh
index 3f9b776cb..5f3ee7d9d 100755
--- a/bin/add-dir.sh
+++ b/bin/add-dir.sh
@@ -88,7 +88,7 @@ shopt -s globstar # enable ** to match all files and zero or more directories an
# set variables referenced in the usage message
#
-export VERSION="1.1 2024-07-23"
+export VERSION="1.1.1 2024-07-28"
NAME=$(basename "$0")
export NAME
export V_FLAG=0
@@ -104,7 +104,9 @@ if [[ $status -eq 0 ]]; then
TOPDIR=$("$GIT_TOOL" rev-parse --show-toplevel)
fi
export TOPDIR
-export REPO_URL="https://github.com/ioccc-src/temp-test-ioccc/blob/master"
+export REPO_TOP_URL="https://github.com/ioccc-src/temp-test-ioccc"
+# GitHub puts individual files under the "blob/master" sub-directory.
+export REPO_URL="$REPO_TOP_URL/blob/master"
#
export NOOP=
export DO_NOT_PROCESS=
@@ -193,21 +195,21 @@ export ENTRY_PATH="$1"
# verify that we have a topdir directory
#
-REPO_NAME=$(basename "$REPO_URL")
+REPO_NAME=$(basename "$REPO_TOP_URL")
export REPO_NAME
if [[ -z $TOPDIR ]]; then
echo "$0: ERROR: cannot find top of git repo directory" 1>&2
- echo "$0: Notice: if needed: $GIT_TOOL clone $REPO_URL; cd $REPO_NAME" 1>&2
+ echo "$0: Notice: if needed: $GIT_TOOL clone $REPO_TOP_URL; cd $REPO_NAME" 1>&2
exit 6
fi
if [[ ! -e $TOPDIR ]]; then
echo "$0: ERROR: TOPDIR does not exist: $TOPDIR" 1>&2
- echo "$0: Notice: if needed: $GIT_TOOL clone $REPO_URL; cd $REPO_NAME" 1>&2
+ echo "$0: Notice: if needed: $GIT_TOOL clone $REPO_TOP_URL; cd $REPO_NAME" 1>&2
exit 6
fi
if [[ ! -d $TOPDIR ]]; then
echo "$0: ERROR: TOPDIR is not a directory: $TOPDIR" 1>&2
- echo "$0: Notice: if needed: $GIT_TOOL clone $REPO_URL; cd $REPO_NAME" 1>&2
+ echo "$0: Notice: if needed: $GIT_TOOL clone $REPO_TOP_URL; cd $REPO_NAME" 1>&2
exit 6
fi
@@ -340,6 +342,7 @@ if [[ $V_FLAG -ge 3 ]]; then
echo "$0: debug[3]: V_FLAG=$V_FLAG" 1>&2
echo "$0: debug[3]: GIT_TOOL=$GIT_TOOL" 1>&2
echo "$0: debug[3]: TOPDIR=$TOPDIR" 1>&2
+ echo "$0: debug[3]: REPO_TOP_URL=$REPO_TOP_URL" 1>&2
echo "$0: debug[3]: REPO_URL=$REPO_URL" 1>&2
echo "$0: debug[3]: NOOP=$NOOP" 1>&2
echo "$0: debug[3]: DO_NOT_PROCESS=$DO_NOT_PROCESS" 1>&2
diff --git a/bin/all-run.sh b/bin/all-run.sh
index 7222e46fb..b29fa2fe9 100755
--- a/bin/all-run.sh
+++ b/bin/all-run.sh
@@ -17,7 +17,7 @@
#
# Each tool run with command line of the form:
#
-# tool [any -D, -t tagline, -T md2html.sh, -p tool, -u repo_url, -w site_url] [more_options] YYYY/dir
+# tool [any -D, -t tagline, -T md2html.sh, -p tool, -u repo_top_url, -w site_url] [more_options] YYYY/dir
#
# For example:
#
@@ -113,7 +113,7 @@ shopt -s globstar # enable ** to match all files and zero or more directories an
# set variables referenced in the usage message
#
-export VERSION="1.3.4 2024-05-24"
+export VERSION="1.3.5 2024-07-28"
NAME=$(basename "$0")
export NAME
export V_FLAG=0
@@ -133,7 +133,9 @@ export DOCROOT_SLASH="../../"
export TAGLINE="unspecified"
export MD2HTML_SH="bin/md2html.sh"
export PANDOC_WRAPPER="bin/pandoc-wrapper.sh"
-export REPO_URL="https://github.com/ioccc-src/temp-test-ioccc/blob/master"
+export REPO_TOP_URL="https://github.com/ioccc-src/temp-test-ioccc"
+# GitHub puts individual files under the "blob/master" sub-directory.
+export REPO_URL="$REPO_TOP_URL/blob/master"
export SITE_URL="https://ioccc-src.github.io/temp-test-ioccc"
#
export NOOP=
@@ -148,7 +150,7 @@ declare -ag TOOL_OPTION
# usage
#
export USAGE="usage: $0 [-h] [-v level] [-V] [-d topdir] [-D docroot/] [-n] [-N]
- [-t tagline] [-T md2html.sh] [-p tool] [-u repo_url] [-w site_url]
+ [-t tagline] [-T md2html.sh] [-p tool] [-u repo_top_url] [-w site_url]
tool [more_options]
-h print help message and exit
@@ -170,8 +172,8 @@ export USAGE="usage: $0 [-h] [-v level] [-V] [-d topdir] [-D docroot/] [-n] [-N]
-p tool run 'pandoc wrapper tool' (not pandoc path) during HTML phase number 21 (def: use $PANDOC_WRAPPER)
- -u repo_url Base level URL of target git repo (def: $REPO_URL)
- NOTE: The '-u repo_url' is passed as leading options on tool command lines.
+ -u repo_top_url Top level URL of target git repo (def: $REPO_TOP_URL)
+ NOTE: The '-u repo_top_url' is passed as leading options on tool command lines.
-w site_url Base URL of the website (def: $SITE_URL)
NOTE: The '-w site_url' is passed as leading options on tool command lines.
@@ -179,7 +181,7 @@ export USAGE="usage: $0 [-h] [-v level] [-V] [-d topdir] [-D docroot/] [-n] [-N]
tool the tool to run over all entries
[more_options] additional tool command line options to use before the YYYY/dir argument
-NOTE: Any '-D docroot/', '-t tagline', '-T md2html.sh', '-p tool', '-u repo_url', '-w site_url'
+NOTE: Any '-D docroot/', '-t tagline', '-T md2html.sh', '-p tool', '-u repo_top_url', '-w site_url'
are passed to the 'tool' at the beginning of the command line, and
before any optional 'more_options' and before the final YYYY/dir argument.
@@ -255,9 +257,9 @@ while getopts :hv:Vd:D:nNt:T:p:u:w: flag; do
TOOL_OPTION+=("-p")
TOOL_OPTION+=("$PANDOC_WRAPPER")
;;
- u) REPO_URL="$OPTARG"
+ u) REPO_TOP_URL="$OPTARG"
TOOL_OPTION+=("-u")
- TOOL_OPTION+=("$REPO_URL")
+ TOOL_OPTION+=("$REPO_TOP_URL")
;;
w) SITE_URL="$OPTARG"
TOOL_OPTION+=("-w")
@@ -310,21 +312,21 @@ esac
# verify that we have a topdir directory
#
-REPO_NAME=$(basename "$REPO_URL")
+REPO_NAME=$(basename "$REPO_TOP_URL")
export REPO_NAME
if [[ -z $TOPDIR ]]; then
echo "$0: ERROR: cannot find top of git repo directory" 1>&2
- echo "$0: Notice: if needed: $GIT_TOOL clone $REPO_URL; cd $REPO_NAME" 1>&2
+ echo "$0: Notice: if needed: $GIT_TOOL clone $REPO_TOP_URL; cd $REPO_NAME" 1>&2
exit 6
fi
if [[ ! -e $TOPDIR ]]; then
echo "$0: ERROR: TOPDIR does not exist: $TOPDIR" 1>&2
- echo "$0: Notice: if needed: $GIT_TOOL clone $REPO_URL; cd $REPO_NAME" 1>&2
+ echo "$0: Notice: if needed: $GIT_TOOL clone $REPO_TOP_URL; cd $REPO_NAME" 1>&2
exit 6
fi
if [[ ! -d $TOPDIR ]]; then
echo "$0: ERROR: TOPDIR is not a directory: $TOPDIR" 1>&2
- echo "$0: Notice: if needed: $GIT_TOOL clone $REPO_URL; cd $REPO_NAME" 1>&2
+ echo "$0: Notice: if needed: $GIT_TOOL clone $REPO_TOP_URL; cd $REPO_NAME" 1>&2
exit 6
fi
@@ -415,6 +417,7 @@ if [[ $V_FLAG -ge 3 ]]; then
echo "$0: debug[3]: TAGLINE=$TAGLINE" 1>&2
echo "$0: debug[3]: MD2HTML_SH=$MD2HTML_SH" 1>&2
echo "$0: debug[3]: PANDOC_WRAPPER=$PANDOC_WRAPPER" 1>&2
+ echo "$0: debug[3]: REPO_TOP_URL=$REPO_TOP_URL" 1>&2
echo "$0: debug[3]: REPO_URL=$REPO_URL" 1>&2
echo "$0: debug[3]: SITE_URL=$SITE_URL" 1>&2
echo "$0: debug[3]: NOOP=$NOOP" 1>&2
diff --git a/bin/all-years.sh b/bin/all-years.sh
index 922c6a5ec..a5a6eecd8 100755
--- a/bin/all-years.sh
+++ b/bin/all-years.sh
@@ -16,7 +16,7 @@
#
# Each tool run with command line of the form:
#
-# tool [any -D, -t tagline, -T md2html.sh, -p tool, -u repo_url, -w site_url] [more_options] YYYY
+# tool [any -D, -t tagline, -T md2html.sh, -p tool, -u repo_top_url, -w site_url] [more_options] YYYY
#
# For example:
#
@@ -111,7 +111,7 @@ shopt -s globstar # enable ** to match all files and zero or more directories an
# set variables referenced in the usage message
#
-export VERSION="1.0.3 2024-04-13"
+export VERSION="1.0.4 2024-07-28"
NAME=$(basename "$0")
export NAME
export V_FLAG=0
@@ -131,7 +131,9 @@ export DOCROOT_SLASH="../../"
export TAGLINE="unspecified"
export MD2HTML_SH="bin/md2html.sh"
export PANDOC_WRAPPER="bin/pandoc-wrapper.sh"
-export REPO_URL="https://github.com/ioccc-src/temp-test-ioccc/blob/master"
+export REPO_TOP_URL="https://github.com/ioccc-src/temp-test-ioccc"
+# GitHub puts individual files under the "blob/master" sub-directory.
+export REPO_URL="$REPO_TOP_URL/blob/master"
export SITE_URL="https://ioccc-src.github.io/temp-test-ioccc"
#
export NOOP=
@@ -146,7 +148,7 @@ declare -ag TOOL_OPTION
# usage
#
export USAGE="usage: $0 [-h] [-v level] [-V] [-d topdir] [-D docroot/] [-n] [-N]
- [-t tagline] [-T md2html.sh] [-p tool] [-u repo_url] [-w site_url]
+ [-t tagline] [-T md2html.sh] [-p tool] [-u repo_top_url] [-w site_url]
tool [more_options]
-h print help message and exit
@@ -169,8 +171,8 @@ export USAGE="usage: $0 [-h] [-v level] [-V] [-d topdir] [-D docroot/] [-n] [-N]
-p tool run 'pandoc wrapper tool' (not pandoc path) during HTML phase number 21 (def: use $PANDOC_WRAPPER)
- -u repo_url Base level URL of target git repo (def: $REPO_URL)
- NOTE: The '-u repo_url' is passed as leading options on tool command lines.
+ -u repo_top_url Top level URL of target git repo (def: $REPO_TOP_URL)
+ NOTE: The '-u repo_top_url' is passed as leading options on tool command lines.
-w site_url Base URL of the website (def: $SITE_URL)
NOTE: The '-w site_url' is passed as leading options on tool command lines.
@@ -178,7 +180,7 @@ export USAGE="usage: $0 [-h] [-v level] [-V] [-d topdir] [-D docroot/] [-n] [-N]
tool the tool to run over all entries
[more_options] additional tool command line options to use before the YYYY/dir argument
-NOTE: Any '-t tagline', '-T md2html.sh', '-p tool', '-u repo_url', '-w site_url'
+NOTE: Any '-t tagline', '-T md2html.sh', '-p tool', '-u repo_top_url', '-w site_url'
are passed to the 'tool' at the beginning of the command line, and
before any optional 'more_options' and before the final YYYY/dir argument.
@@ -254,9 +256,9 @@ while getopts :hv:Vd:D:nNt:T:p:u:w: flag; do
TOOL_OPTION+=("-p")
TOOL_OPTION+=("$PANDOC_WRAPPER")
;;
- u) REPO_URL="$OPTARG"
+ u) REPO_TOP_URL="$OPTARG"
TOOL_OPTION+=("-u")
- TOOL_OPTION+=("$REPO_URL")
+ TOOL_OPTION+=("$REPO_TOP_URL")
;;
w) SITE_URL="$OPTARG"
TOOL_OPTION+=("-w")
@@ -309,21 +311,21 @@ esac
# verify that we have a topdir directory
#
-REPO_NAME=$(basename "$REPO_URL")
+REPO_NAME=$(basename "$REPO_TOP_URL")
export REPO_NAME
if [[ -z $TOPDIR ]]; then
echo "$0: ERROR: cannot find top of git repo directory" 1>&2
- echo "$0: Notice: if needed: $GIT_TOOL clone $REPO_URL; cd $REPO_NAME" 1>&2
+ echo "$0: Notice: if needed: $GIT_TOOL clone $REPO_TOP_URL; cd $REPO_NAME" 1>&2
exit 6
fi
if [[ ! -e $TOPDIR ]]; then
echo "$0: ERROR: TOPDIR does not exist: $TOPDIR" 1>&2
- echo "$0: Notice: if needed: $GIT_TOOL clone $REPO_URL; cd $REPO_NAME" 1>&2
+ echo "$0: Notice: if needed: $GIT_TOOL clone $REPO_TOP_URL; cd $REPO_NAME" 1>&2
exit 6
fi
if [[ ! -d $TOPDIR ]]; then
echo "$0: ERROR: TOPDIR is not a directory: $TOPDIR" 1>&2
- echo "$0: Notice: if needed: $GIT_TOOL clone $REPO_URL; cd $REPO_NAME" 1>&2
+ echo "$0: Notice: if needed: $GIT_TOOL clone $REPO_TOP_URL; cd $REPO_NAME" 1>&2
exit 6
fi
@@ -414,6 +416,7 @@ if [[ $V_FLAG -ge 3 ]]; then
echo "$0: debug[3]: TAGLINE=$TAGLINE" 1>&2
echo "$0: debug[3]: MD2HTML_SH=$MD2HTML_SH" 1>&2
echo "$0: debug[3]: PANDOC_WRAPPER=$PANDOC_WRAPPER" 1>&2
+ echo "$0: debug[3]: REPO_TOP_URL=$REPO_TOP_URL" 1>&2
echo "$0: debug[3]: REPO_URL=$REPO_URL" 1>&2
echo "$0: debug[3]: SITE_URL=$SITE_URL" 1>&2
echo "$0: debug[3]: NOOP=$NOOP" 1>&2
diff --git a/bin/chk-entry.sh b/bin/chk-entry.sh
index 87dbf5557..67ffd2385 100755
--- a/bin/chk-entry.sh
+++ b/bin/chk-entry.sh
@@ -85,7 +85,7 @@ shopt -s globstar # enable ** to match all files and zero or more directories an
# set variables referenced in the usage message
#
-export VERSION="1.1.8 2024-07-06"
+export VERSION="1.1.9 2024-07-28"
NAME=$(basename "$0")
export NAME
export V_FLAG=0
@@ -101,12 +101,14 @@ if [[ $status -eq 0 ]]; then
TOPDIR=$("$GIT_TOOL" rev-parse --show-toplevel)
fi
export TOPDIR
-export REPO_URL="https://github.com/ioccc-src/temp-test-ioccc/blob/master"
+export REPO_TOP_URL="https://github.com/ioccc-src/temp-test-ioccc"
+# GitHub puts individual files under the "blob/master" sub-directory.
+export REPO_URL="$REPO_TOP_URL/blob/master"
# set usage message
#
export USAGE="usage: $0 [-h] [-v level] [-V] [-d topdir] [-D docroot/] [-n] [-N]
- [-p tool] [-u repo_url] [-w site_url]
+ [-p tool] [-u repo_top_url] [-w site_url]
YYYY/dir
-h print help message and exit
@@ -121,7 +123,7 @@ export USAGE="usage: $0 [-h] [-v level] [-V] [-d topdir] [-D docroot/] [-n] [-N]
-p tool This option is ignored
- -u repo_url This option is ignored
+ -u repo_top_url This option is ignored
-w site_url This option is ignored
YYYY/dir path from topdir to entry directory: must contain the files: README.md, .path and .entry.json
@@ -206,21 +208,21 @@ export ENTRY_PATH="$1"
# verify that we have a topdir directory
#
-REPO_NAME=$(basename "$REPO_URL")
+REPO_NAME=$(basename "$REPO_TOP_URL")
export REPO_NAME
if [[ -z $TOPDIR ]]; then
echo "$0: ERROR: cannot find top of git repo directory" 1>&2
- echo "$0: Notice: if needed: $GIT_TOOL clone $REPO_URL; cd $REPO_NAME" 1>&2
+ echo "$0: Notice: if needed: $GIT_TOOL clone $REPO_TOP_URL; cd $REPO_NAME" 1>&2
exit 6
fi
if [[ ! -e $TOPDIR ]]; then
echo "$0: ERROR: TOPDIR does not exist: $TOPDIR" 1>&2
- echo "$0: Notice: if needed: $GIT_TOOL clone $REPO_URL; cd $REPO_NAME" 1>&2
+ echo "$0: Notice: if needed: $GIT_TOOL clone $REPO_TOP_URL; cd $REPO_NAME" 1>&2
exit 6
fi
if [[ ! -d $TOPDIR ]]; then
echo "$0: ERROR: TOPDIR is not a directory: $TOPDIR" 1>&2
- echo "$0: Notice: if needed: $GIT_TOOL clone $REPO_URL; cd $REPO_NAME" 1>&2
+ echo "$0: Notice: if needed: $GIT_TOOL clone $REPO_TOP_URL; cd $REPO_NAME" 1>&2
exit 6
fi
@@ -357,6 +359,7 @@ if [[ $V_FLAG -ge 3 ]]; then
echo "$0: debug[3]: V_FLAG=$V_FLAG" 1>&2
echo "$0: debug[3]: GIT_TOOL=$GIT_TOOL" 1>&2
echo "$0: debug[3]: TOPDIR=$TOPDIR" 1>&2
+ echo "$0: debug[3]: REPO_TOP_URL=$REPO_TOP_URL" 1>&2
echo "$0: debug[3]: REPO_URL=$REPO_URL" 1>&2
echo "$0: debug[3]: NOOP=$NOOP" 1>&2
echo "$0: debug[3]: DO_NOT_PROCESS=$DO_NOT_PROCESS" 1>&2
diff --git a/bin/cvt-submission.sh b/bin/cvt-submission.sh
index f80fa9218..13f580a26 100755
--- a/bin/cvt-submission.sh
+++ b/bin/cvt-submission.sh
@@ -102,7 +102,7 @@ shopt -s globstar # enable ** to match all files and zero or more directories an
# set variables referenced in the usage message
#
-export VERSION="1.0 2024-07-22"
+export VERSION="1.0.1 2024-07-28"
NAME=$(basename "$0")
export NAME
export V_FLAG=0
@@ -118,7 +118,9 @@ if [[ $status -eq 0 ]]; then
TOPDIR=$("$GIT_TOOL" rev-parse --show-toplevel)
fi
export TOPDIR
-export REPO_URL="https://github.com/ioccc-src/temp-test-ioccc/blob/master"
+export REPO_TOP_URL="https://github.com/ioccc-src/temp-test-ioccc"
+# GitHub puts individual files under the "blob/master" sub-directory.
+export REPO_URL="$REPO_TOP_URL/blob/master"
#
export NOOP=
export DO_NOT_PROCESS=
@@ -208,21 +210,21 @@ export ENTRY_PATH="$1"
# verify that we have a topdir directory
#
-REPO_NAME=$(basename "$REPO_URL")
+REPO_NAME=$(basename "$REPO_TOP_URL")
export REPO_NAME
if [[ -z $TOPDIR ]]; then
echo "$0: ERROR: cannot find top of git repo directory" 1>&2
- echo "$0: Notice: if needed: $GIT_TOOL clone $REPO_URL; cd $REPO_NAME" 1>&2
+ echo "$0: Notice: if needed: $GIT_TOOL clone $REPO_TOP_URL; cd $REPO_NAME" 1>&2
exit 6
fi
if [[ ! -e $TOPDIR ]]; then
echo "$0: ERROR: TOPDIR does not exist: $TOPDIR" 1>&2
- echo "$0: Notice: if needed: $GIT_TOOL clone $REPO_URL; cd $REPO_NAME" 1>&2
+ echo "$0: Notice: if needed: $GIT_TOOL clone $REPO_TOP_URL; cd $REPO_NAME" 1>&2
exit 6
fi
if [[ ! -d $TOPDIR ]]; then
echo "$0: ERROR: TOPDIR is not a directory: $TOPDIR" 1>&2
- echo "$0: Notice: if needed: $GIT_TOOL clone $REPO_URL; cd $REPO_NAME" 1>&2
+ echo "$0: Notice: if needed: $GIT_TOOL clone $REPO_TOP_URL; cd $REPO_NAME" 1>&2
exit 6
fi
@@ -337,6 +339,7 @@ if [[ $V_FLAG -ge 3 ]]; then
echo "$0: debug[3]: V_FLAG=$V_FLAG" 1>&2
echo "$0: debug[3]: GIT_TOOL=$GIT_TOOL" 1>&2
echo "$0: debug[3]: TOPDIR=$TOPDIR" 1>&2
+ echo "$0: debug[3]: REPO_TOP_URL=$REPO_TOP_URL" 1>&2
echo "$0: debug[3]: REPO_URL=$REPO_URL" 1>&2
echo "$0: debug[3]: NOOP=$NOOP" 1>&2
echo "$0: debug[3]: DO_NOT_PROCESS=$DO_NOT_PROCESS" 1>&2
diff --git a/bin/gen-authors.sh b/bin/gen-authors.sh
index c7d718791..51f6e7aef 100755
--- a/bin/gen-authors.sh
+++ b/bin/gen-authors.sh
@@ -85,7 +85,7 @@ shopt -s globstar # enable ** to match all files and zero or more directories an
# set variables referenced in the usage message
#
-export VERSION="1.10.4 2024-07-13"
+export VERSION="1.10.5 2024-07-28"
NAME=$(basename "$0")
export NAME
export V_FLAG=0
@@ -105,7 +105,9 @@ export DOCROOT_SLASH="./"
export TAGLINE="bin/$NAME"
export MD2HTML_SH="bin/md2html.sh"
export PANDOC_WRAPPER="bin/pandoc-wrapper.sh"
-export REPO_URL="https://github.com/ioccc-src/temp-test-ioccc/blob/master"
+export REPO_TOP_URL="https://github.com/ioccc-src/temp-test-ioccc"
+# GitHub puts individual files under the "blob/master" sub-directory.
+export REPO_URL="$REPO_TOP_URL/blob/master"
export SITE_URL="https://ioccc-src.github.io/temp-test-ioccc"
#
export NOOP=
@@ -151,7 +153,7 @@ declare -ag TOOL_OPTION
# usage
#
export USAGE="usage: $0 [-h] [-v level] [-V] [-d topdir] [-D docroot/] [-n] [-N]
- [-t tagline] [-T md2html.sh] [-p tool] [-u repo_url]
+ [-t tagline] [-T md2html.sh] [-p tool] [-u repo_top_url]
-h print help message and exit
-v level set verbosity level (def level: 0)
@@ -174,14 +176,14 @@ export USAGE="usage: $0 [-h] [-v level] [-V] [-d topdir] [-D docroot/] [-n] [-N]
-p tool run 'pandoc wrapper tool' (not pandoc path) during HTML phase number 21 (def: use $PANDOC_WRAPPER)
NOTE: The '-p tool' is passed as leading options on tool command lines.
- -u repo_url Base level URL of target git repo (def: $REPO_URL)
- NOTE: The '-u repo_url' is passed as leading options on tool command lines.
+ -u repo_top_url Top level URL of target git repo (def: $REPO_TOP_URL)
+ NOTE: The '-u repo_top_url' is passed as leading options on tool command lines.
-w site_url Base URL of the website (def: $SITE_URL)
NOTE: The '-w site_url' is passed as leading options on tool command lines.
NOTE: The '-v level' is passed as initial command line options to the 'markdown to html tool' (md2html.sh).
The 'tagline' is passed as '-t tagline' to the 'markdown to html tool' (md2html.sh), after the '-v level'.
- Any '-T md2html.sh', '-p tool', '-P pandoc_opts', '-u repo_url', '-U top_url'
+ Any '-T md2html.sh', '-p tool', '-P pandoc_opts', '-u repo_top_url', '-U top_url'
are passed to the 'markdown to html tool' (md2html.sh), and will be before any command line arguments.
Exit codes:
@@ -804,9 +806,9 @@ while getopts :hv:Vd:D:nNt:T:p:u:w: flag; do
TOOL_OPTION+=("-p")
TOOL_OPTION+=("$PANDOC_WRAPPER")
;;
- u) REPO_URL="$OPTARG"
+ u) REPO_TOP_URL="$OPTARG"
TOOL_OPTION+=("-u")
- TOOL_OPTION+=("$REPO_URL")
+ TOOL_OPTION+=("$REPO_TOP_URL")
;;
w) SITE_URL="$OPTARG"
TOOL_OPTION+=("-w")
@@ -871,21 +873,21 @@ TOOL_OPTION+=("$DOCROOT_SLASH")
# verify that we have a topdir directory
#
-REPO_NAME=$(basename "$REPO_URL")
+REPO_NAME=$(basename "$REPO_TOP_URL")
export REPO_NAME
if [[ -z $TOPDIR ]]; then
echo "$0: ERROR: cannot find top of git repo directory" 1>&2
- echo "$0: Notice: if needed: $GIT_TOOL clone $REPO_URL; cd $REPO_NAME" 1>&2
+ echo "$0: Notice: if needed: $GIT_TOOL clone $REPO_TOP_URL; cd $REPO_NAME" 1>&2
exit 6
fi
if [[ ! -e $TOPDIR ]]; then
echo "$0: ERROR: TOPDIR does not exist: $TOPDIR" 1>&2
- echo "$0: Notice: if needed: $GIT_TOOL clone $REPO_URL; cd $REPO_NAME" 1>&2
+ echo "$0: Notice: if needed: $GIT_TOOL clone $REPO_TOP_URL; cd $REPO_NAME" 1>&2
exit 6
fi
if [[ ! -d $TOPDIR ]]; then
echo "$0: ERROR: TOPDIR is not a directory: $TOPDIR" 1>&2
- echo "$0: Notice: if needed: $GIT_TOOL clone $REPO_URL; cd $REPO_NAME" 1>&2
+ echo "$0: Notice: if needed: $GIT_TOOL clone $REPO_TOP_URL; cd $REPO_NAME" 1>&2
exit 6
fi
@@ -978,6 +980,7 @@ if [[ $V_FLAG -ge 3 ]]; then
echo "$0: debug[3]: TAGLINE=$TAGLINE" 1>&2
echo "$0: debug[3]: MD2HTML_SH=$MD2HTML_SH" 1>&2
echo "$0: debug[3]: PANDOC_WRAPPER=$PANDOC_WRAPPER" 1>&2
+ echo "$0: debug[3]: REPO_TOP_URL=$REPO_TOP_URL" 1>&2
echo "$0: debug[3]: REPO_URL=$REPO_URL" 1>&2
echo "$0: debug[3]: SITE_URL=$SITE_URL" 1>&2
echo "$0: debug[3]: NOOP=$NOOP" 1>&2
@@ -1239,8 +1242,8 @@ EOF
# NOTE: AUTHOR_GITHUB will be empty if there is no GitHub handle
AUTHOR_GITHUB=$(output_github "$filename")
export AUTHOR_GITHUB
- AUTHOR_GUTHUB_USERNAME=${AUTHOR_GITHUB#@}
- export AUTHOR_GUTHUB_USERNAME
+ AUTHOR_GITHUB_USERNAME=${AUTHOR_GITHUB#@}
+ export AUTHOR_GITHUB_USERNAME
# output author information
#
@@ -1272,10 +1275,10 @@ EOF
fi
if [[ -n $AUTHOR_GITHUB ]]; then
echo "
"
- echo "GitHub: $AUTHOR_GITHUB"
+ echo "GitHub: $AUTHOR_GITHUB"
fi
echo "
"
- echo "author_handle: $AUTHOR_HANDLE"
+ echo "author_handle: $AUTHOR_HANDLE"
echo ""
# output YYYY/dir set made by this author
diff --git a/bin/gen-location.sh b/bin/gen-location.sh
index c93488979..d541d2e65 100755
--- a/bin/gen-location.sh
+++ b/bin/gen-location.sh
@@ -84,7 +84,7 @@ shopt -s globstar # enable ** to match all files and zero or more directories an
# set variables referenced in the usage message
#
-export VERSION="1.4.3 2024-07-13"
+export VERSION="1.4.4 2024-07-28"
NAME=$(basename "$0")
export NAME
export V_FLAG=0
@@ -104,7 +104,9 @@ export DOCROOT_SLASH="./"
export TAGLINE="bin/$NAME"
export MD2HTML_SH="bin/md2html.sh"
export PANDOC_WRAPPER="bin/pandoc-wrapper.sh"
-export REPO_URL="https://github.com/ioccc-src/temp-test-ioccc/blob/master"
+export REPO_TOP_URL="https://github.com/ioccc-src/temp-test-ioccc"
+# GitHub puts individual files under the "blob/master" sub-directory.
+export REPO_URL="$REPO_TOP_URL/blob/master"
export SITE_URL="https://ioccc-src.github.io/temp-test-ioccc"
#
export NOOP=
@@ -119,7 +121,7 @@ declare -ag TOOL_OPTION
# usage
#
export USAGE="usage: $0 [-h] [-v level] [-V] [-d topdir] [-D docroot/] [-n] [-N]
- [-t tagline] [-T md2html.sh] [-p tool] [-u repo_url]
+ [-t tagline] [-T md2html.sh] [-p tool] [-u repo_top_url]
-h print help message and exit
-v level set verbosity level (def level: 0)
@@ -142,14 +144,14 @@ export USAGE="usage: $0 [-h] [-v level] [-V] [-d topdir] [-D docroot/] [-n] [-N]
-p tool run 'pandoc wrapper tool' (not pandoc path) during HTML phase number 21 (def: use $PANDOC_WRAPPER)
NOTE: The '-p tool' is passed as leading options on tool command lines.
- -u repo_url Base level URL of target git repo (def: $REPO_URL)
- NOTE: The '-u repo_url' is passed as leading options on tool command lines.
+ -u repo_top_url Top level URL of target git repo (def: $REPO_TOP_URL)
+ NOTE: The '-u repo_top_url' is passed as leading options on tool command lines.
-w site_url Base URL of the website (def: $SITE_URL)
NOTE: The '-w site_url' is passed as leading options on tool command lines.
NOTE: The '-v level' is passed as initial command line options to the 'markdown to html tool' (md2html.sh).
The 'tagline' is passed as '-t tagline' to the 'markdown to html tool' (md2html.sh), after the '-v level'.
- Any '-T md2html.sh', '-p tool', '-P pandoc_opts', '-u repo_url', '-U top_url'
+ Any '-T md2html.sh', '-p tool', '-P pandoc_opts', '-u repo_top_url', '-U top_url'
are passed to the 'markdown to html tool' (md2html.sh), and will be before any command line arguments.
Exit codes:
@@ -224,9 +226,9 @@ while getopts :hv:Vd:D:nNt:T:p:u:w: flag; do
TOOL_OPTION+=("-p")
TOOL_OPTION+=("$PANDOC_WRAPPER")
;;
- u) REPO_URL="$OPTARG"
+ u) REPO_TOP_URL="$OPTARG"
TOOL_OPTION+=("-u")
- TOOL_OPTION+=("$REPO_URL")
+ TOOL_OPTION+=("$REPO_TOP_URL")
;;
w) SITE_URL="$OPTARG"
TOOL_OPTION+=("-w")
@@ -291,21 +293,21 @@ TOOL_OPTION+=("$DOCROOT_SLASH")
# verify that we have a topdir directory
#
-REPO_NAME=$(basename "$REPO_URL")
+REPO_NAME=$(basename "$REPO_TOP_URL")
export REPO_NAME
if [[ -z $TOPDIR ]]; then
echo "$0: ERROR: cannot find top of git repo directory" 1>&2
- echo "$0: Notice: if needed: $GIT_TOOL clone $REPO_URL; cd $REPO_NAME" 1>&2
+ echo "$0: Notice: if needed: $GIT_TOOL clone $REPO_TOP_URL; cd $REPO_NAME" 1>&2
exit 6
fi
if [[ ! -e $TOPDIR ]]; then
echo "$0: ERROR: TOPDIR does not exist: $TOPDIR" 1>&2
- echo "$0: Notice: if needed: $GIT_TOOL clone $REPO_URL; cd $REPO_NAME" 1>&2
+ echo "$0: Notice: if needed: $GIT_TOOL clone $REPO_TOP_URL; cd $REPO_NAME" 1>&2
exit 6
fi
if [[ ! -d $TOPDIR ]]; then
echo "$0: ERROR: TOPDIR is not a directory: $TOPDIR" 1>&2
- echo "$0: Notice: if needed: $GIT_TOOL clone $REPO_URL; cd $REPO_NAME" 1>&2
+ echo "$0: Notice: if needed: $GIT_TOOL clone $REPO_TOP_URL; cd $REPO_NAME" 1>&2
exit 6
fi
@@ -398,6 +400,7 @@ if [[ $V_FLAG -ge 3 ]]; then
echo "$0: debug[3]: TAGLINE=$TAGLINE" 1>&2
echo "$0: debug[3]: MD2HTML_SH=$MD2HTML_SH" 1>&2
echo "$0: debug[3]: PANDOC_WRAPPER=$PANDOC_WRAPPER" 1>&2
+ echo "$0: debug[3]: REPO_TOP_URL=$REPO_TOP_URL" 1>&2
echo "$0: debug[3]: REPO_URL=$REPO_URL" 1>&2
echo "$0: debug[3]: SITE_URL=$SITE_URL" 1>&2
echo "$0: debug[3]: NOOP=$NOOP" 1>&2
diff --git a/bin/gen-other-html.sh b/bin/gen-other-html.sh
index 45d96a5f1..ec42169b5 100755
--- a/bin/gen-other-html.sh
+++ b/bin/gen-other-html.sh
@@ -84,7 +84,7 @@ shopt -s globstar # enable ** to match all files and zero or more directories an
# set variables referenced in the usage message
#
-export VERSION="1.2.4 2024-05-31"
+export VERSION="1.2.5 2024-07-28"
NAME=$(basename "$0")
export NAME
export V_FLAG=0
@@ -104,7 +104,9 @@ export DOCROOT_SLASH="../../"
export TAGLINE="bin/$NAME"
export MD2HTML_SH="bin/md2html.sh"
export PANDOC_WRAPPER="bin/pandoc-wrapper.sh"
-export REPO_URL="https://github.com/ioccc-src/temp-test-ioccc/blob/master"
+export REPO_TOP_URL="https://github.com/ioccc-src/temp-test-ioccc"
+# GitHub puts individual files under the "blob/master" sub-directory.
+export REPO_URL="$REPO_TOP_URL/blob/master"
export SITE_URL="https://ioccc-src.github.io/temp-test-ioccc"
#
export NOOP=
@@ -119,7 +121,7 @@ declare -ag TOOL_OPTION
# usage
#
export USAGE="usage: $0 [-h] [-v level] [-V] [-d topdir] [-D docroot/] [-n] [-N]
- [-t tagline] [-T md2html.sh] [-p tool] [-u repo_url] [-w site_url]
+ [-t tagline] [-T md2html.sh] [-p tool] [-u repo_top_url] [-w site_url]
-h print help message and exit
-v level set verbosity level (def level: 0)
@@ -140,13 +142,13 @@ export USAGE="usage: $0 [-h] [-v level] [-V] [-d topdir] [-D docroot/] [-n] [-N]
-p tool run 'pandoc wrapper tool' (not pandoc path) during HTML phase number 21 (def: use $PANDOC_WRAPPER)
- -u repo_url Base level URL of target git repo (def: $REPO_URL)
- NOTE: The '-u repo_url' is passed as leading options on tool command lines.
+ -u repo_top_url Top level URL of target git repo (def: $REPO_TOP_URL)
+ NOTE: The '-u repo_top_url' is passed as leading options on tool command lines.
-w site_url Base URL of the website (def: $SITE_URL)
NOTE: The '-w site_url' is passed as leading options on tool command lines.
-NOTE: Any '-D docroot/', '-t tagline', '-T md2html.sh', '-p tool', '-u repo_url', '-w site_url'
+NOTE: Any '-D docroot/', '-t tagline', '-T md2html.sh', '-p tool', '-u repo_top_url', '-w site_url'
are passed to the 'tool' at the beginning of the command line, and
before any optional 'more_options' and before the final YYYY/dir argument.
@@ -221,7 +223,9 @@ while getopts :hv:Vd:D:nNt:T:p:u:w: flag; do
TOOL_OPTION+=("-p")
TOOL_OPTION+=("$PANDOC_WRAPPER")
;;
- u) REPO_URL="$OPTARG"
+ u) REPO_TOP_URL="$OPTARG"
+ # GitHub puts individual files under the "blob/master" sub-directory.
+ export REPO_URL="$REPO_TOP_URL/blob/master"
;;
w) SITE_URL="$OPTARG"
;;
@@ -259,21 +263,21 @@ fi
# verify that we have a topdir directory
#
-REPO_NAME=$(basename "$REPO_URL")
+REPO_NAME=$(basename "$REPO_TOP_URL")
export REPO_NAME
if [[ -z $TOPDIR ]]; then
echo "$0: ERROR: cannot find top of git repo directory" 1>&2
- echo "$0: Notice: if needed: $GIT_TOOL clone $REPO_URL; cd $REPO_NAME" 1>&2
+ echo "$0: Notice: if needed: $GIT_TOOL clone $REPO_TOP_URL; cd $REPO_NAME" 1>&2
exit 6
fi
if [[ ! -e $TOPDIR ]]; then
echo "$0: ERROR: TOPDIR does not exist: $TOPDIR" 1>&2
- echo "$0: Notice: if needed: $GIT_TOOL clone $REPO_URL; cd $REPO_NAME" 1>&2
+ echo "$0: Notice: if needed: $GIT_TOOL clone $REPO_TOP_URL; cd $REPO_NAME" 1>&2
exit 6
fi
if [[ ! -d $TOPDIR ]]; then
echo "$0: ERROR: TOPDIR is not a directory: $TOPDIR" 1>&2
- echo "$0: Notice: if needed: $GIT_TOOL clone $REPO_URL; cd $REPO_NAME" 1>&2
+ echo "$0: Notice: if needed: $GIT_TOOL clone $REPO_TOP_URL; cd $REPO_NAME" 1>&2
exit 6
fi
@@ -340,7 +344,7 @@ fi
TOOL_OPTION+=("-t")
TOOL_OPTION+=("$TAGLINE")
TOOL_OPTION+=("-u")
-TOOL_OPTION+=("$REPO_URL")
+TOOL_OPTION+=("$REPO_TOP_URL")
TOOL_OPTION+=("-w")
TOOL_OPTION+=("$SITE_URL")
@@ -358,6 +362,7 @@ if [[ $V_FLAG -ge 3 ]]; then
echo "$0: debug[3]: TAGLINE=$TAGLINE" 1>&2
echo "$0: debug[3]: MD2HTML_SH=$MD2HTML_SH" 1>&2
echo "$0: debug[3]: PANDOC_WRAPPER=$PANDOC_WRAPPER" 1>&2
+ echo "$0: debug[3]: REPO_TOP_URL=$REPO_TOP_URL" 1>&2
echo "$0: debug[3]: REPO_URL=$REPO_URL" 1>&2
echo "$0: debug[3]: SITE_URL=$SITE_URL" 1>&2
echo "$0: debug[3]: NOOP=$NOOP" 1>&2
diff --git a/bin/gen-sitemap.sh b/bin/gen-sitemap.sh
index 47c9bb786..6389bd896 100755
--- a/bin/gen-sitemap.sh
+++ b/bin/gen-sitemap.sh
@@ -84,7 +84,7 @@ shopt -s globstar # enable ** to match all files and zero or more directories an
# set variables referenced in the usage message
#
-export VERSION="1.3.11 2024-07-22"
+export VERSION="1.3.12 2024-07-28"
NAME=$(basename "$0")
export NAME
export V_FLAG=0
@@ -100,7 +100,9 @@ if [[ $status -eq 0 ]]; then
TOPDIR=$("$GIT_TOOL" rev-parse --show-toplevel)
fi
export TOPDIR
-export REPO_URL="https://github.com/ioccc-src/temp-test-ioccc/blob/master"
+export REPO_TOP_URL="https://github.com/ioccc-src/temp-test-ioccc"
+# GitHub puts individual files under the "blob/master" sub-directory.
+export REPO_URL="$REPO_TOP_URL/blob/master"
export SITE_URL="https://ioccc-src.github.io/temp-test-ioccc"
export CAP_W_FLAG_FOUND=
export MODTIME_METHOD=""
@@ -195,7 +197,7 @@ function output_modtime
# set usage message
#
export USAGE="usage: $0 [-h] [-v level] [-V] [-d topdir] [-n] [-N]
- [-u repo_url] [-w site_url] [-W]
+ [-u repo_top_url] [-w site_url] [-W]
-h print help message and exit
-v level set verbosity level (def level: 0)
@@ -206,8 +208,7 @@ export USAGE="usage: $0 [-h] [-v level] [-V] [-d topdir] [-n] [-N]
-n go thru the actions, but do not update any files (def: do the action)
-N do not process file, just parse arguments and ignore the file (def: process the file)
- -u repo_url Base level URL of target git repo (def: $REPO_URL)
- NOTE: The '-u repo_url' is passed as leading options on tool command lines.
+ -u repo_top_url Top level URL of target git repo (def: $REPO_TOP_URL)
-w site_url Base URL of the website (def: $SITE_URL)
NOTE: The '-w site_url' is passed as leading options on tool command lines.
@@ -253,7 +254,9 @@ while getopts :hv:Vd:nNu:w:W flag; do
;;
N) DO_NOT_PROCESS="-N"
;;
- u) REPO_URL="$OPTARG"
+ u) REPO_TOP_URL="$OPTARG"
+ # GitHub puts individual files under the "blob/master" sub-directory.
+ export REPO_URL="$REPO_TOP_URL/blob/master"
;;
w) SITE_URL="$OPTARG"
;;
@@ -296,21 +299,21 @@ fi
# verify that we have a topdir directory
#
-REPO_NAME=$(basename "$REPO_URL")
+REPO_NAME=$(basename "$REPO_TOP_URL")
export REPO_NAME
if [[ -z $TOPDIR ]]; then
echo "$0: ERROR: cannot find top of git repo directory" 1>&2
- echo "$0: Notice: if needed: $GIT_TOOL clone $REPO_URL; cd $REPO_NAME" 1>&2
+ echo "$0: Notice: if needed: $GIT_TOOL clone $REPO_TOP_URL; cd $REPO_NAME" 1>&2
exit 6
fi
if [[ ! -e $TOPDIR ]]; then
echo "$0: ERROR: TOPDIR does not exist: $TOPDIR" 1>&2
- echo "$0: Notice: if needed: $GIT_TOOL clone $REPO_URL; cd $REPO_NAME" 1>&2
+ echo "$0: Notice: if needed: $GIT_TOOL clone $REPO_TOP_URL; cd $REPO_NAME" 1>&2
exit 6
fi
if [[ ! -d $TOPDIR ]]; then
echo "$0: ERROR: TOPDIR is not a directory: $TOPDIR" 1>&2
- echo "$0: Notice: if needed: $GIT_TOOL clone $REPO_URL; cd $REPO_NAME" 1>&2
+ echo "$0: Notice: if needed: $GIT_TOOL clone $REPO_TOP_URL; cd $REPO_NAME" 1>&2
exit 6
fi
@@ -482,6 +485,7 @@ if [[ $V_FLAG -ge 3 ]]; then
echo "$0: debug[3]: V_FLAG=$V_FLAG" 1>&2
echo "$0: debug[3]: GIT_TOOL=$GIT_TOOL" 1>&2
echo "$0: debug[3]: TOPDIR=$TOPDIR" 1>&2
+ echo "$0: debug[3]: REPO_TOP_URL=$REPO_TOP_URL" 1>&2
echo "$0: debug[3]: REPO_URL=$REPO_URL" 1>&2
echo "$0: debug[3]: SITE_URL=$SITE_URL" 1>&2
echo "$0: debug[3]: CAP_W_FLAG_FOUND=$CAP_W_FLAG_FOUND" 1>&2
diff --git a/bin/gen-status.sh b/bin/gen-status.sh
index 47b4e318f..96824dfdc 100755
--- a/bin/gen-status.sh
+++ b/bin/gen-status.sh
@@ -84,7 +84,7 @@ shopt -s globstar # enable ** to match all files and zero or more directories an
# set variables referenced in the usage message
#
-export VERSION="1.5.6 2024-07-22"
+export VERSION="1.5.7 2024-07-28"
NAME=$(basename "$0")
export NAME
export V_FLAG=0
@@ -103,7 +103,9 @@ export TOPDIR
export DOCROOT_SLASH="./"
export TAGLINE="bin/$NAME"
export MD2HTML_SH="bin/md2html.sh"
-export REPO_URL="https://github.com/ioccc-src/temp-test-ioccc/blob/master"
+export REPO_TOP_URL="https://github.com/ioccc-src/temp-test-ioccc"
+# GitHub puts individual files under the "blob/master" sub-directory.
+export REPO_URL="$REPO_TOP_URL/blob/master"
export SITE_URL="https://ioccc-src.github.io/temp-test-ioccc"
JPARSE_TOOL=$(type -P jparse)
export JPARSE_TOOL
@@ -334,7 +336,7 @@ function output_status_json
# usage
#
export USAGE="usage: $0 [-h] [-v level] [-V] [-d topdir] [-n] [-N]
- [-t tagline] [-T md2html.sh] [-u repo_url]
+ [-t tagline] [-T md2html.sh] [-u repo_top_url]
[p | pending | o | open | j | judging | c | closed]
-h print help message and exit
@@ -355,8 +357,8 @@ export USAGE="usage: $0 [-h] [-v level] [-V] [-d topdir] [-n] [-N]
NOTE: 'tagline' may be enclosed within, but may NOT contain an internal single-quote, or double-quote.
-T md2html.sh run 'markdown to html tool' to convert markdown into HTML (def: $MD2HTML_SH)
- -u repo_url Base level URL of target git repo (def: $REPO_URL)
- NOTE: The '-u repo_url' is passed as leading options on tool command lines.
+ -u repo_top_url Top level URL of target git repo (def: $REPO_TOP_URL)
+ NOTE: The '-u repo_top_url' is passed as leading options on tool command lines.
-w site_url Base URL of the website (def: $SITE_URL)
NOTE: The '-w site_url' is passed as leading options on tool command lines.
@@ -368,7 +370,7 @@ export USAGE="usage: $0 [-h] [-v level] [-V] [-d topdir] [-n] [-N]
NOTE: The '-v level' is passed as initial command line options to the 'markdown to html tool' (md2html.sh).
The 'tagline' is passed as '-t tagline' to the 'markdown to html tool' (md2html.sh), after the '-v level'.
- Any '-T md2html.sh', '-p tool', '-P pandoc_opts', '-u repo_url', '-U top_url'
+ Any '-T md2html.sh', '-p tool', '-P pandoc_opts', '-u repo_top_url', '-U top_url'
are passed to the 'markdown to html tool' (md2html.sh), and will be before any command line arguments.
Exit codes:
@@ -438,9 +440,9 @@ while getopts :hv:Vd:D:nNt:T:u:w: flag; do
TOOL_OPTION+=("-T")
TOOL_OPTION+=("$MD2HTML_SH")
;;
- u) REPO_URL="$OPTARG"
+ u) REPO_TOP_URL="$OPTARG"
TOOL_OPTION+=("-u")
- TOOL_OPTION+=("$REPO_URL")
+ TOOL_OPTION+=("$REPO_TOP_URL")
;;
w) SITE_URL="$OPTARG"
TOOL_OPTION+=("-w")
@@ -523,21 +525,21 @@ TOOL_OPTION+=("$DOCROOT_SLASH")
# verify that we have a topdir directory
#
-REPO_NAME=$(basename "$REPO_URL")
+REPO_NAME=$(basename "$REPO_TOP_URL")
export REPO_NAME
if [[ -z $TOPDIR ]]; then
echo "$0: ERROR: cannot find top of git repo directory" 1>&2
- echo "$0: Notice: if needed: $GIT_TOOL clone $REPO_URL; cd $REPO_NAME" 1>&2
+ echo "$0: Notice: if needed: $GIT_TOOL clone $REPO_TOP_URL; cd $REPO_NAME" 1>&2
exit 6
fi
if [[ ! -e $TOPDIR ]]; then
echo "$0: ERROR: TOPDIR does not exist: $TOPDIR" 1>&2
- echo "$0: Notice: if needed: $GIT_TOOL clone $REPO_URL; cd $REPO_NAME" 1>&2
+ echo "$0: Notice: if needed: $GIT_TOOL clone $REPO_TOP_URL; cd $REPO_NAME" 1>&2
exit 6
fi
if [[ ! -d $TOPDIR ]]; then
echo "$0: ERROR: TOPDIR is not a directory: $TOPDIR" 1>&2
- echo "$0: Notice: if needed: $GIT_TOOL clone $REPO_URL; cd $REPO_NAME" 1>&2
+ echo "$0: Notice: if needed: $GIT_TOOL clone $REPO_TOP_URL; cd $REPO_NAME" 1>&2
exit 6
fi
@@ -751,6 +753,7 @@ if [[ $V_FLAG -ge 3 ]]; then
echo "$0: debug[3]: DOCROOT_SLASH=$DOCROOT_SLASH" 1>&2
echo "$0: debug[3]: TAGLINE=$TAGLINE" 1>&2
echo "$0: debug[3]: MD2HTML_SH=$MD2HTML_SH" 1>&2
+ echo "$0: debug[3]: REPO_TOP_URL=$REPO_TOP_URL" 1>&2
echo "$0: debug[3]: REPO_URL=$REPO_URL" 1>&2
echo "$0: debug[3]: SITE_URL=$SITE_URL" 1>&2
echo "$0: debug[3]: JPARSE_TOOL=$JPARSE_TOOL" 1>&2
diff --git a/bin/gen-top-html.sh b/bin/gen-top-html.sh
index 49bfd8763..591be5882 100755
--- a/bin/gen-top-html.sh
+++ b/bin/gen-top-html.sh
@@ -93,7 +93,7 @@ shopt -s globstar # enable ** to match all files and zero or more directories an
# set variables referenced in the usage message
#
-export VERSION="1.4.6 2024-05-24"
+export VERSION="1.4.7 2024-07-28"
NAME=$(basename "$0")
export NAME
export V_FLAG=0
@@ -113,7 +113,9 @@ export DOCROOT_SLASH="./"
export TAGLINE="bin/$NAME"
export MD2HTML_SH="bin/md2html.sh"
export PANDOC_WRAPPER="bin/pandoc-wrapper.sh"
-export REPO_URL="https://github.com/ioccc-src/temp-test-ioccc/blob/master"
+export REPO_TOP_URL="https://github.com/ioccc-src/temp-test-ioccc"
+# GitHub puts individual files under the "blob/master" sub-directory.
+export REPO_URL="$REPO_TOP_URL/blob/master"
export SITE_URL="https://ioccc-src.github.io/temp-test-ioccc"
#
unset TOP_MD_SET
@@ -152,7 +154,7 @@ declare -ag TOOL_OPTION
# usage
#
export USAGE="usage: $0 [-h] [-v level] [-V] [-d topdir] [-D docroot/] [-n] [-N]
- [-t tagline] [-T md2html.sh] [-p tool] [-u repo_url] [file...]
+ [-t tagline] [-T md2html.sh] [-p tool] [-u repo_top_url] [file...]
-h print help message and exit
-v level set verbosity level (def level: 0)
@@ -175,14 +177,14 @@ export USAGE="usage: $0 [-h] [-v level] [-V] [-d topdir] [-D docroot/] [-n] [-N]
-p tool run 'pandoc wrapper tool' (not pandoc path) during HTML phase number 21 (def: use $PANDOC_WRAPPER)
NOTE: The '-p tool' is passed as leading options on tool command lines.
- -u repo_url Base level URL of target git repo (def: $REPO_URL)
- NOTE: The '-u repo_url' is passed as leading options on tool command lines.
+ -u repo_top_url Top level URL of target git repo (def: $REPO_TOP_URL)
+ NOTE: The '-u repo_top_url' is passed as leading options on tool command lines.
-w site_url Base URL of the website (def: $SITE_URL)
NOTE: The '-w site_url' is passed as leading options on tool command lines.
NOTE: The '-v level' is passed as initial command line options to the 'markdown to html tool' (md2html.sh).
The 'tagline' is passed as '-t tagline' to the 'markdown to html tool' (md2html.sh), after the '-v level'.
- Any '-T md2html.sh', '-p tool', '-P pandoc_opts', '-u repo_url', '-U top_url'
+ Any '-T md2html.sh', '-p tool', '-P pandoc_opts', '-u repo_top_url', '-U top_url'
are passed to the 'markdown to html tool' (md2html.sh), and will be before any command line arguments.
Exit codes:
@@ -257,9 +259,9 @@ while getopts :hv:Vd:D:nNt:T:p:u:w: flag; do
TOOL_OPTION+=("-p")
TOOL_OPTION+=("$PANDOC_WRAPPER")
;;
- u) REPO_URL="$OPTARG"
+ u) REPO_TOP_URL="$OPTARG"
TOOL_OPTION+=("-u")
- TOOL_OPTION+=("$REPO_URL")
+ TOOL_OPTION+=("$REPO_TOP_URL")
;;
w) SITE_URL="$OPTARG"
TOOL_OPTION+=("-w")
@@ -334,21 +336,21 @@ TOOL_OPTION+=("$DOCROOT_SLASH")
# verify that we have a topdir directory
#
-REPO_NAME=$(basename "$REPO_URL")
+REPO_NAME=$(basename "$REPO_TOP_URL")
export REPO_NAME
if [[ -z $TOPDIR ]]; then
echo "$0: ERROR: cannot find top of git repo directory" 1>&2
- echo "$0: Notice: if needed: $GIT_TOOL clone $REPO_URL; cd $REPO_NAME" 1>&2
+ echo "$0: Notice: if needed: $GIT_TOOL clone $REPO_TOP_URL; cd $REPO_NAME" 1>&2
exit 6
fi
if [[ ! -e $TOPDIR ]]; then
echo "$0: ERROR: TOPDIR does not exist: $TOPDIR" 1>&2
- echo "$0: Notice: if needed: $GIT_TOOL clone $REPO_URL; cd $REPO_NAME" 1>&2
+ echo "$0: Notice: if needed: $GIT_TOOL clone $REPO_TOP_URL; cd $REPO_NAME" 1>&2
exit 6
fi
if [[ ! -d $TOPDIR ]]; then
echo "$0: ERROR: TOPDIR is not a directory: $TOPDIR" 1>&2
- echo "$0: Notice: if needed: $GIT_TOOL clone $REPO_URL; cd $REPO_NAME" 1>&2
+ echo "$0: Notice: if needed: $GIT_TOOL clone $REPO_TOP_URL; cd $REPO_NAME" 1>&2
exit 6
fi
@@ -436,6 +438,7 @@ if [[ $V_FLAG -ge 3 ]]; then
echo "$0: debug[3]: TAGLINE=$TAGLINE" 1>&2
echo "$0: debug[3]: MD2HTML_SH=$MD2HTML_SH" 1>&2
echo "$0: debug[3]: PANDOC_WRAPPER=$PANDOC_WRAPPER" 1>&2
+ echo "$0: debug[3]: REPO_TOP_URL=$REPO_TOP_URL" 1>&2
echo "$0: debug[3]: REPO_URL=$REPO_URL" 1>&2
echo "$0: debug[3]: SITE_URL=$SITE_URL" 1>&2
if (( ${#TOP_MD_SELECT_SET[@]} )); then
diff --git a/bin/gen-year-index.sh b/bin/gen-year-index.sh
index 040728923..c8a5656f5 100755
--- a/bin/gen-year-index.sh
+++ b/bin/gen-year-index.sh
@@ -85,7 +85,7 @@ shopt -s globstar # enable ** to match all files and zero or more directories an
# set variables referenced in the usage message
#
-export VERSION="1.1 2024-04-16"
+export VERSION="1.1.1 2024-07-28"
NAME=$(basename "$0")
export NAME
export V_FLAG=0
@@ -104,7 +104,9 @@ export TOPDIR
export DOCROOT_SLASH="../../"
export TAGLINE="bin/$NAME"
export MD2HTML_SH="bin/md2html.sh"
-export REPO_URL="https://github.com/ioccc-src/temp-test-ioccc/blob/master"
+export REPO_TOP_URL="https://github.com/ioccc-src/temp-test-ioccc"
+# GitHub puts individual files under the "blob/master" sub-directory.
+export REPO_URL="$REPO_TOP_URL/blob/master"
export SITE_URL="https://ioccc-src.github.io/temp-test-ioccc"
# clear options we will add to tools
@@ -115,7 +117,7 @@ declare -ag TOOL_OPTION
# set usage message
#
export USAGE="usage: $0 [-h] [-v level] [-V] [-d topdir] [-n] [-N]
- [-t tagline] [-T md2html.sh] [-u repo_url] [-w site_url]
+ [-t tagline] [-T md2html.sh] [-u repo_top_url] [-w site_url]
YYYY [more_options]
-h print help message and exit
@@ -132,8 +134,10 @@ export USAGE="usage: $0 [-h] [-v level] [-V] [-d topdir] [-n] [-N]
-t tagline string to write about the tool that formed the markdown content (def: $TAGLINE)
-T md2html.sh run 'markdown to html tool' to convert markdown into HTML (def: $MD2HTML_SH)
- -u repo_url Base level URL of target git repo (def: $REPO_URL)
+ -u repo_top_url Top level URL of target git repo (def: $REPO_TOP_URL)
+ NOTE: The '-u repo_top_url' is passed as leading options on tool command lines.
-w site_url Base URL of the website (def: $SITE_URL)
+ NOTE: The '-w site_url' is passed as leading options on tool command lines.
YYYY path from topdir to year directory: must contain the files: README.md, .path and .entry.json
[more_options] additional tool command line options to use before the YYYY argument
@@ -210,9 +214,9 @@ while getopts :hv:Vd:D:nNt:T:u:w: flag; do
TOOL_OPTION+=("-T")
TOOL_OPTION+=("$MD2HTML_SH")
;;
- u) REPO_URL="$OPTARG"
+ u) REPO_TOP_URL="$OPTARG"
TOOL_OPTION+=("-u")
- TOOL_OPTION+=("$REPO_URL")
+ TOOL_OPTION+=("$REPO_TOP_URL")
;;
w) SITE_URL="$OPTARG"
TOOL_OPTION+=("-w")
@@ -271,21 +275,21 @@ fi
# verify that we have a topdir directory
#
-REPO_NAME=$(basename "$REPO_URL")
+REPO_NAME=$(basename "$REPO_TOP_URL")
export REPO_NAME
if [[ -z $TOPDIR ]]; then
echo "$0: ERROR: cannot find top of git repo directory" 1>&2
- echo "$0: Notice: if needed: $GIT_TOOL clone $REPO_URL; cd $REPO_NAME" 1>&2
+ echo "$0: Notice: if needed: $GIT_TOOL clone $REPO_TOP_URL; cd $REPO_NAME" 1>&2
exit 6
fi
if [[ ! -e $TOPDIR ]]; then
echo "$0: ERROR: TOPDIR does not exist: $TOPDIR" 1>&2
- echo "$0: Notice: if needed: $GIT_TOOL clone $REPO_URL; cd $REPO_NAME" 1>&2
+ echo "$0: Notice: if needed: $GIT_TOOL clone $REPO_TOP_URL; cd $REPO_NAME" 1>&2
exit 6
fi
if [[ ! -d $TOPDIR ]]; then
echo "$0: ERROR: TOPDIR is not a directory: $TOPDIR" 1>&2
- echo "$0: Notice: if needed: $GIT_TOOL clone $REPO_URL; cd $REPO_NAME" 1>&2
+ echo "$0: Notice: if needed: $GIT_TOOL clone $REPO_TOP_URL; cd $REPO_NAME" 1>&2
exit 6
fi
@@ -398,6 +402,7 @@ if [[ $V_FLAG -ge 3 ]]; then
echo "$0: debug[3]: DOCROOT_SLASH=$DOCROOT_SLASH" 1>&2
echo "$0: debug[3]: TAGLINE=$TAGLINE" 1>&2
echo "$0: debug[3]: MD2HTML_SH=$MD2HTML_SH" 1>&2
+ echo "$0: debug[3]: REPO_TOP_URL=$REPO_TOP_URL" 1>&2
echo "$0: debug[3]: REPO_URL=$REPO_URL" 1>&2
echo "$0: debug[3]: SITE_URL=$SITE_URL" 1>&2
for index in "${!TOOL_OPTION[@]}"; do
diff --git a/bin/gen-years.sh b/bin/gen-years.sh
index aad07022e..ca0c6a1a8 100755
--- a/bin/gen-years.sh
+++ b/bin/gen-years.sh
@@ -85,7 +85,7 @@ shopt -s globstar # enable ** to match all files and zero or more directories an
# set variables referenced in the usage message
#
-export VERSION="1.3.5 2024-07-22"
+export VERSION="1.3.6 2024-07-28"
NAME=$(basename "$0")
export NAME
export V_FLAG=0
@@ -117,7 +117,9 @@ export DOCROOT_SLASH="./"
export TAGLINE="bin/$NAME"
export MD2HTML_SH="bin/md2html.sh"
export PANDOC_WRAPPER="bin/pandoc-wrapper.sh"
-export REPO_URL="https://github.com/ioccc-src/temp-test-ioccc/blob/master"
+export REPO_TOP_URL="https://github.com/ioccc-src/temp-test-ioccc"
+# GitHub puts individual files under the "blob/master" sub-directory.
+export REPO_URL="$REPO_TOP_URL/blob/master"
export SITE_URL="https://ioccc-src.github.io/temp-test-ioccc"
#
export NOOP=
@@ -132,7 +134,7 @@ declare -ag TOOL_OPTION
# usage
#
export USAGE="usage: $0 [-h] [-v level] [-V] [-d topdir] [-D docroot/] [-n] [-N]
- [-t tagline] [-T md2html.sh] [-p tool] [-u repo_url]
+ [-t tagline] [-T md2html.sh] [-p tool] [-u repo_top_url]
-h print help message and exit
-v level set verbosity level (def level: 0)
@@ -155,14 +157,14 @@ export USAGE="usage: $0 [-h] [-v level] [-V] [-d topdir] [-D docroot/] [-n] [-N]
-p tool run 'pandoc wrapper tool' (not pandoc path) during HTML phase number 21 (def: use $PANDOC_WRAPPER)
NOTE: The '-p tool' is passed as leading options on tool command lines.
- -u repo_url Base level URL of target git repo (def: $REPO_URL)
- NOTE: The '-u repo_url' is passed as leading options on tool command lines.
+ -u repo_top_url Top level URL of target git repo (def: $REPO_TOP_URL)
+ NOTE: The '-u repo_top_url' is passed as leading options on tool command lines.
-w site_url Base URL of the website (def: $SITE_URL)
NOTE: The '-w site_url' is passed as leading options on tool command lines.
NOTE: The '-v level' is passed as initial command line options to the 'markdown to html tool' (md2html.sh).
The 'tagline' is passed as '-t tagline' to the 'markdown to html tool' (md2html.sh), after the '-v level'.
- Any '-T md2html.sh', '-p tool', '-P pandoc_opts', '-u repo_url', '-U top_url'
+ Any '-T md2html.sh', '-p tool', '-P pandoc_opts', '-u repo_top_url', '-U top_url'
are passed to the 'markdown to html tool' (md2html.sh), and will be before any command line arguments.
Exit codes:
@@ -351,9 +353,9 @@ while getopts :hv:Vd:D:nNt:T:p:u:w: flag; do
TOOL_OPTION+=("-p")
TOOL_OPTION+=("$PANDOC_WRAPPER")
;;
- u) REPO_URL="$OPTARG"
+ u) REPO_TOP_URL="$OPTARG"
TOOL_OPTION+=("-u")
- TOOL_OPTION+=("$REPO_URL")
+ TOOL_OPTION+=("$REPO_TOP_URL")
;;
w) SITE_URL="$OPTARG"
TOOL_OPTION+=("-w")
@@ -418,21 +420,21 @@ TOOL_OPTION+=("$DOCROOT_SLASH")
# verify that we have a topdir directory
#
-REPO_NAME=$(basename "$REPO_URL")
+REPO_NAME=$(basename "$REPO_TOP_URL")
export REPO_NAME
if [[ -z $TOPDIR ]]; then
echo "$0: ERROR: cannot find top of git repo directory" 1>&2
- echo "$0: Notice: if needed: $GIT_TOOL clone $REPO_URL; cd $REPO_NAME" 1>&2
+ echo "$0: Notice: if needed: $GIT_TOOL clone $REPO_TOP_URL; cd $REPO_NAME" 1>&2
exit 6
fi
if [[ ! -e $TOPDIR ]]; then
echo "$0: ERROR: TOPDIR does not exist: $TOPDIR" 1>&2
- echo "$0: Notice: if needed: $GIT_TOOL clone $REPO_URL; cd $REPO_NAME" 1>&2
+ echo "$0: Notice: if needed: $GIT_TOOL clone $REPO_TOP_URL; cd $REPO_NAME" 1>&2
exit 6
fi
if [[ ! -d $TOPDIR ]]; then
echo "$0: ERROR: TOPDIR is not a directory: $TOPDIR" 1>&2
- echo "$0: Notice: if needed: $GIT_TOOL clone $REPO_URL; cd $REPO_NAME" 1>&2
+ echo "$0: Notice: if needed: $GIT_TOOL clone $REPO_TOP_URL; cd $REPO_NAME" 1>&2
exit 6
fi
@@ -523,6 +525,7 @@ if [[ $V_FLAG -ge 3 ]]; then
echo "$0: debug[3]: TAGLINE=$TAGLINE" 1>&2
echo "$0: debug[3]: MD2HTML_SH=$MD2HTML_SH" 1>&2
echo "$0: debug[3]: PANDOC_WRAPPER=$PANDOC_WRAPPER" 1>&2
+ echo "$0: debug[3]: REPO_TOP_URL=$REPO_TOP_URL" 1>&2
echo "$0: debug[3]: REPO_URL=$REPO_URL" 1>&2
echo "$0: debug[3]: SITE_URL=$SITE_URL" 1>&2
echo "$0: debug[3]: NOOP=$NOOP" 1>&2
diff --git a/bin/manifest.entry.json.awk b/bin/manifest.entry.json.awk
index 54badc937..e055a08cd 100755
--- a/bin/manifest.entry.json.awk
+++ b/bin/manifest.entry.json.awk
@@ -10,7 +10,8 @@
#
# YYYY IOCCC year or mock
# dir name of entry's directory under YYYY containing .entry.json
-# REPO_URL GitHub repo URL, e.g., https://github.com/ioccc-src/winner
+# REPO_URL GitHub repo URL, e.g., https://github.com/ioccc-src/winner/blob/master/blob/master
+# We append blob/master to account for how GitHub forms file URLs.
# XXX - XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX - XXX
# XXX - GROSS HACK - GROSS HACK - GROSS HACK - GROSS HACK - GROSS HACK - GROSS HACK - XXX
@@ -22,7 +23,7 @@ BEGIN {
# setup
#
- VERSION="1.1.1 2024-04-13"
+ VERSION="1.1.2 2024-07-28"
found_manifest_array = 0; # 1 ==> we found the manifest ARRAY
within_manifest_array = 0; # 1 ==> found start of "manifest" : [ JSON array
begin_manifest_element = 0; # 1 ==> we have found the start of the manifest array element
diff --git a/bin/md2html.sh b/bin/md2html.sh
index 2ac00c398..e90fe48ae 100755
--- a/bin/md2html.sh
+++ b/bin/md2html.sh
@@ -141,7 +141,7 @@ shopt -s lastpipe # run last command of a pipeline not executed in the backgroun
# set variables referenced in the usage message
#
-export VERSION="1.5.3 2024-07-22"
+export VERSION="1.5.4 2024-07-28"
NAME=$(basename "$0")
export NAME
export V_FLAG=0
@@ -165,7 +165,9 @@ fi
export TOPDIR
export DOCROOT_SLASH="./"
export PANDOC_WRAPPER="bin/pandoc-wrapper.sh"
-export REPO_URL="https://github.com/ioccc-src/temp-test-ioccc/blob/master"
+export REPO_TOP_URL="https://github.com/ioccc-src/temp-test-ioccc"
+# GitHub puts individual files under the "blob/master" sub-directory.
+export REPO_URL="$REPO_TOP_URL/blob/master"
export SITE_URL="https://ioccc-src.github.io/temp-test-ioccc"
export URL="#"
@@ -175,7 +177,7 @@ export USAGE="usage: $0 [-h] [-v level] [-V] [-d topdir] [-D docroot/] [-n] [-N]
[-c md2html.cfg] [-H phase=name ..] [-t tagline]
[-b tool] [-p tool] [-a tool]
[-s token=value ..] [-S] [-o tool ..]
- [-u repo_url] [-U url] [-w site_url] [-m mdtag] [-e string ..] [-E exitcode]
+ [-u repo_top_url] [-U url] [-w site_url] [-m mdtag] [-e string ..] [-E exitcode]
[match.md] input.md output.html
-h print help message and exit
@@ -224,11 +226,12 @@ export USAGE="usage: $0 [-h] [-v level] [-V] [-d topdir] [-D docroot/] [-n] [-N]
-o . disable use of 'output tool' (def: do not use an 'output tool')
NOTE: -o may only be used in command_options and md2html.cfg cfg_options (getopt phases 0 and 2)
- -u repo_url base level URL of target git repo (def: $REPO_URL)
- NOTE: The '-u repo_url' is passed as leading options on -b tool, -a tool, and -o tool command lines.
+ -u repo_top_url Top level URL of target git repo (def: $REPO_TOP_URL)
+ NOTE: The '-u repo_top_url' is passed as leading options on -b tool, -a tool, and -o tool command lines.
-U url URL of HTML being formed (def: $URL)
NOTE: The '-U url' is passed as leading options on -b tool, -a tool, and -o tool command lines.
-w site_url Base URL of the website (def: $SITE_URL)
+ NOTE: The '-w site_url' is passed as leading options on -b tool, -a tool, and -o tool command lines.
-m mdtag string to write about the markdown file used to form HTML content (def: no markdown file is used)
-e string output 'string', followed by newline, to stderr (def: do not)
@@ -275,15 +278,18 @@ function global_variable_setup
export NOOP=
export DO_NOT_PROCESS=
export TOPDIR=
+ # REPO_TOP_URL set above the export USAGE line
# REPO_URL set above the export USAGE line
export MD2HTML_CFG=
export BEFORE_TOOL=
# DOCROOT_SLASH set above the export USAGE line
# PANDOC_WRAPPER set above the export USAGE line
+ # REPO_TOP_URL set above the export USAGE line
# REPO_URL set above the export USAGE line
# SITE_URL set above the export USAGE line
export P_FLAG_FOUND=
export CAP_P_FLAG_FOUND=
+ # REPO_TOP_URL set above the export USAGE line
# REPO_URL set above the export USAGE line
export U_FLAG_FOUND=
# URL set above the export USAGE line
@@ -634,15 +640,15 @@ function parse_command_line
#
OUTPUT_TOOL+=("$OPTARG")
;;
- u) REPO_URL="$OPTARG"
+ u) REPO_TOP_URL="$OPTARG"
B_OPTION+=("-u")
- B_OPTION+=("$REPO_URL")
+ B_OPTION+=("$REPO_TOP_URL")
P_OPTION+=("-u")
- P_OPTION+=("$REPO_URL")
+ P_OPTION+=("$REPO_TOP_URL")
A_OPTION+=("-u")
- A_OPTION+=("$REPO_URL")
+ A_OPTION+=("$REPO_TOP_URL")
O_OPTION+=("-u")
- O_OPTION+=("$REPO_URL")
+ O_OPTION+=("$REPO_TOP_URL")
;;
U) URL="$OPTARG"
B_OPTION+=("-U")
@@ -723,6 +729,7 @@ function debug_parameters
echo "$0: debug[$DEBUG_LEVEL]: $DBG_PREFIX: TOPDIR=$TOPDIR" 1>&2
echo "$0: debug[$DEBUG_LEVEL]: $DBG_PREFIX: DOCROOT_SLASH=$DOCROOT_SLASH" 1>&2
echo "$0: debug[$DEBUG_LEVEL]: $DBG_PREFIX: PANDOC_WRAPPER=$PANDOC_WRAPPER" 1>&2
+ echo "$0: debug[$DEBUG_LEVEL]: $DBG_PREFIX: REPO_TOP_URL=$REPO_TOP_URL" 1>&2
echo "$0: debug[$DEBUG_LEVEL]: $DBG_PREFIX: REPO_URL=$REPO_URL" 1>&2
echo "$0: debug[$DEBUG_LEVEL]: $DBG_PREFIX: SITE_URL=$SITE_URL" 1>&2
echo "$0: debug[$DEBUG_LEVEL]: $DBG_PREFIX: URL=$URL" 1>&2
@@ -1106,21 +1113,21 @@ export WORKING_DIR
# verify that we have a topdir directory
#
-REPO_NAME=$(basename "$REPO_URL")
+REPO_NAME=$(basename "$REPO_TOP_URL")
export REPO_NAME
if [[ -z $TOPDIR ]]; then
echo "$0: ERROR: cannot find top of git repo directory" 1>&2
- echo "$0: Notice: if needed: $GIT_TOOL clone $REPO_URL; cd $REPO_NAME" 1>&2
+ echo "$0: Notice: if needed: $GIT_TOOL clone $REPO_TOP_URL; cd $REPO_NAME" 1>&2
exit 6
fi
if [[ ! -e $TOPDIR ]]; then
echo "$0: ERROR: TOPDIR does not exist: $TOPDIR" 1>&2
- echo "$0: Notice: if needed: $GIT_TOOL clone $REPO_URL; cd $REPO_NAME" 1>&2
+ echo "$0: Notice: if needed: $GIT_TOOL clone $REPO_TOP_URL; cd $REPO_NAME" 1>&2
exit 6
fi
if [[ ! -d $TOPDIR ]]; then
echo "$0: ERROR: TOPDIR is not a directory: $TOPDIR" 1>&2
- echo "$0: Notice: if needed: $GIT_TOOL clone $REPO_URL; cd $REPO_NAME" 1>&2
+ echo "$0: Notice: if needed: $GIT_TOOL clone $REPO_TOP_URL; cd $REPO_NAME" 1>&2
exit 6
fi
@@ -1470,6 +1477,7 @@ if [[ $V_FLAG -ge 3 ]]; then
echo "$0: debug[3]: after parse in getopt phase: $GETOPT_PHASE: GIT_TOOL=$GIT_TOOL" 1>&2
echo "$0: debug[3]: after parse in getopt phase: $GETOPT_PHASE: DOCROOT_SLASH=$DOCROOT_SLASH" 1>&2
echo "$0: debug[3]: after parse in getopt phase: $GETOPT_PHASE: PANDOC_WRAPPER=$PANDOC_WRAPPER" 1>&2
+ echo "$0: debug[3]: after parse in getopt phase: $GETOPT_PHASE: REPO_TOP_URL=$REPO_TOP_URL" 1>&2
echo "$0: debug[3]: after parse in getopt phase: $GETOPT_PHASE: REPO_URL=$REPO_URL" 1>&2
echo "$0: debug[3]: after parse in getopt phase: $GETOPT_PHASE: SITE_URL=$SITE_URL" 1>&2
echo "$0: debug[3]: after parse in getopt phase: $GETOPT_PHASE: URL=$URL" 1>&2
diff --git a/bin/new-year.sh b/bin/new-year.sh
index eabba575c..a41a00664 100755
--- a/bin/new-year.sh
+++ b/bin/new-year.sh
@@ -87,7 +87,7 @@ shopt -s globstar # enable ** to match all files and zero or more directories an
# set variables referenced in the usage message
#
-export VERSION="1.3.1 2024-07-23"
+export VERSION="1.3.2 2024-07-28"
NAME=$(basename "$0")
export NAME
export V_FLAG=0
@@ -110,7 +110,9 @@ if [[ -z $NUMBER_TOOL ]]; then
exit 5
fi
export TOPDIR
-export REPO_URL="https://github.com/ioccc-src/temp-test-ioccc/blob/master"
+export REPO_TOP_URL="https://github.com/ioccc-src/temp-test-ioccc"
+# GitHub puts individual files under the "blob/master" sub-directory.
+export REPO_URL="$REPO_TOP_URL/blob/master"
export TEMPLATE="template"
#
export NOOP=
@@ -298,21 +300,21 @@ fi
# verify that we have a topdir directory
#
-REPO_NAME=$(basename "$REPO_URL")
+REPO_NAME=$(basename "$REPO_TOP_URL")
export REPO_NAME
if [[ -z $TOPDIR ]]; then
echo "$0: ERROR: cannot find top of git repo directory" 1>&2
- echo "$0: Notice: if needed: $GIT_TOOL clone $REPO_URL; cd $REPO_NAME" 1>&2
+ echo "$0: Notice: if needed: $GIT_TOOL clone $REPO_TOP_URL; cd $REPO_NAME" 1>&2
exit 6
fi
if [[ ! -e $TOPDIR ]]; then
echo "$0: ERROR: TOPDIR does not exist: $TOPDIR" 1>&2
- echo "$0: Notice: if needed: $GIT_TOOL clone $REPO_URL; cd $REPO_NAME" 1>&2
+ echo "$0: Notice: if needed: $GIT_TOOL clone $REPO_TOP_URL; cd $REPO_NAME" 1>&2
exit 6
fi
if [[ ! -d $TOPDIR ]]; then
echo "$0: ERROR: TOPDIR is not a directory: $TOPDIR" 1>&2
- echo "$0: Notice: if needed: $GIT_TOOL clone $REPO_URL; cd $REPO_NAME" 1>&2
+ echo "$0: Notice: if needed: $GIT_TOOL clone $REPO_TOP_URL; cd $REPO_NAME" 1>&2
exit 6
fi
@@ -385,6 +387,7 @@ if [[ $V_FLAG -ge 3 ]]; then
echo "$0: debug[3]: V_FLAG=$V_FLAG" 1>&2
echo "$0: debug[3]: GIT_TOOL=$GIT_TOOL" 1>&2
echo "$0: debug[3]: TOPDIR=$TOPDIR" 1>&2
+ echo "$0: debug[3]: REPO_TOP_URL=$REPO_TOP_URL" 1>&2
echo "$0: debug[3]: REPO_URL=$REPO_URL" 1>&2
echo "$0: debug[3]: NUMBER_TOOL=$NUMBER_TOOL" 1>&2
echo "$0: debug[3]: TEMPLATE=$TEMPLATE" 1>&2
diff --git a/bin/output-index-author.sh b/bin/output-index-author.sh
index 18067361a..0d93cc326 100755
--- a/bin/output-index-author.sh
+++ b/bin/output-index-author.sh
@@ -101,7 +101,7 @@ shopt -s globstar # enable ** to match all files and zero or more directories an
# set variables referenced in the usage message
#
-export VERSION="1.7.1 2024-04-28"
+export VERSION="1.7.2 2024-07-28"
NAME=$(basename "$0")
export NAME
export V_FLAG=0
@@ -119,14 +119,16 @@ fi
export TOPDIR
export DOCROOT_SLASH="../../"
export PANDOC_WRAPPER="bin/pandoc-wrapper.sh"
-export REPO_URL="https://github.com/ioccc-src/temp-test-ioccc/blob/master"
+export REPO_TOP_URL="https://github.com/ioccc-src/temp-test-ioccc"
+# GitHub puts individual files under the "blob/master" sub-directory.
+export REPO_URL="$REPO_TOP_URL/blob/master"
export SITE_URL="https://ioccc-src.github.io/temp-test-ioccc"
export URL="#"
# set usage message
#
export USAGE="usage: $0 [-h] [-v level] [-V] [-d topdir] [-D docroot/] [-n] [-N]
- [-p tool] [-u repo_url] [-U url] [-w site_url] [-e string ..] [-E exitcode]
+ [-p tool] [-u repo_top_url] [-U url] [-w site_url] [-e string ..] [-E exitcode]
YYYY/dir
-h print help message and exit
@@ -142,7 +144,7 @@ export USAGE="usage: $0 [-h] [-v level] [-V] [-d topdir] [-D docroot/] [-n] [-N]
-p tool run 'pandoc wrapper tool' (not pandoc path) during HTML phase number 21 (def: use $PANDOC_WRAPPER)
- -u repo_url Base level URL of target git repo (def: $REPO_URL)
+ -u repo_top_url Top level URL of target git repo (def: $REPO_TOP_URL)
-U url URL of HTML file being formed (def: $URL)
-w site_url Base URL of the website (def: $SITE_URL)
@@ -401,7 +403,9 @@ while getopts :hv:Vd:D:nNp:u:U:w:e:E: flag; do
;;
p) PANDOC_WRAPPER="$OPTARG"
;;
- u) REPO_URL="$OPTARG"
+ u) REPO_TOP_URL="$OPTARG"
+ # GitHub puts individual files under the "blob/master" sub-directory.
+ export REPO_URL="$REPO_TOP_URL/blob/master"
;;
U) URL="$OPTARG"
;;
@@ -449,21 +453,21 @@ export ENTRY_PATH="$1"
# verify that we have a topdir directory
#
-REPO_NAME=$(basename "$REPO_URL")
+REPO_NAME=$(basename "$REPO_TOP_URL")
export REPO_NAME
if [[ -z $TOPDIR ]]; then
echo "$0: ERROR: cannot find top of git repo directory" 1>&2
- echo "$0: Notice: if needed: $GIT_TOOL clone $REPO_URL; cd $REPO_NAME" 1>&2
+ echo "$0: Notice: if needed: $GIT_TOOL clone $REPO_TOP_URL; cd $REPO_NAME" 1>&2
exit 6
fi
if [[ ! -e $TOPDIR ]]; then
echo "$0: ERROR: TOPDIR does not exist: $TOPDIR" 1>&2
- echo "$0: Notice: if needed: $GIT_TOOL clone $REPO_URL; cd $REPO_NAME" 1>&2
+ echo "$0: Notice: if needed: $GIT_TOOL clone $REPO_TOP_URL; cd $REPO_NAME" 1>&2
exit 6
fi
if [[ ! -d $TOPDIR ]]; then
echo "$0: ERROR: TOPDIR is not a directory: $TOPDIR" 1>&2
- echo "$0: Notice: if needed: $GIT_TOOL clone $REPO_URL; cd $REPO_NAME" 1>&2
+ echo "$0: Notice: if needed: $GIT_TOOL clone $REPO_TOP_URL; cd $REPO_NAME" 1>&2
exit 6
fi
@@ -630,6 +634,7 @@ if [[ $V_FLAG -ge 3 ]]; then
echo "$0: debug[3]: TOPDIR=$TOPDIR" 1>&2
echo "$0: debug[3]: DOCROOT_SLASH=$DOCROOT_SLASH" 1>&2
echo "$0: debug[3]: PANDOC_WRAPPER=$PANDOC_WRAPPER" 1>&2
+ echo "$0: debug[3]: REPO_TOP_URL=$REPO_TOP_URL" 1>&2
echo "$0: debug[3]: REPO_URL=$REPO_URL" 1>&2
echo "$0: debug[3]: SITE_URL=$SITE_URL" 1>&2
echo "$0: debug[3]: URL=$URL" 1>&2
diff --git a/bin/output-index-inventory.sh b/bin/output-index-inventory.sh
index d79e7621f..a12a3b5cb 100755
--- a/bin/output-index-inventory.sh
+++ b/bin/output-index-inventory.sh
@@ -101,7 +101,7 @@ shopt -s globstar # enable '**' to match all files and zero or more directories
# set variables referenced in the usage message
#
-export VERSION="1.4.1 2024-04-28"
+export VERSION="1.4.2 2024-07-28"
NAME=$(basename "$0")
export NAME
export V_FLAG=0
@@ -119,14 +119,16 @@ fi
export TOPDIR
export PANDOC_WRAPPER="bin/pandoc-wrapper.sh"
export DOCROOT_SLASH="../../"
-export REPO_URL="https://github.com/ioccc-src/temp-test-ioccc/blob/master"
+export REPO_TOP_URL="https://github.com/ioccc-src/temp-test-ioccc"
+# GitHub puts individual files under the "blob/master" sub-directory.
+export REPO_URL="$REPO_TOP_URL/blob/master"
export SITE_URL="https://ioccc-src.github.io/temp-test-ioccc"
export URL="#"
# set usage message
#
export USAGE="usage: $0 [-h] [-v level] [-V] [-d topdir] [-D docroot/] [-n] [-N]
- [-p tool] [-u repo_url] [-U url] [-w site_url] [-e string ..] [-E exitcode]
+ [-p tool] [-u repo_top_url] [-U url] [-w site_url] [-e string ..] [-E exitcode]
YYYY/dir
-h print help message and exit
@@ -142,7 +144,7 @@ export USAGE="usage: $0 [-h] [-v level] [-V] [-d topdir] [-D docroot/] [-n] [-N]
-p tool run 'pandoc wrapper tool' (not pandoc path) during HTML phase number 21 (def: use $PANDOC_WRAPPER)
- -u repo_url Base level URL of target git repo (def: $REPO_URL)
+ -u repo_top_url Top level URL of target git repo (def: $REPO_TOP_URL)
-U url URL of HTML file being formed (def: $URL)
-w site_url Base URL of the website (def: $SITE_URL)
@@ -199,7 +201,9 @@ while getopts :hv:Vd:D:nNp:u:U:w:e:E: flag; do
;;
p) PANDOC_WRAPPER="$OPTARG"
;;
- u) REPO_URL="$OPTARG"
+ u) REPO_TOP_URL="$OPTARG"
+ # GitHub puts individual files under the "blob/master" sub-directory.
+ export REPO_URL="$REPO_TOP_URL/blob/master"
;;
U) URL="$OPTARG"
;;
@@ -247,21 +251,21 @@ export ENTRY_PATH="$1"
# verify that we have a topdir directory
#
-REPO_NAME=$(basename "$REPO_URL")
+REPO_NAME=$(basename "$REPO_TOP_URL")
export REPO_NAME
if [[ -z $TOPDIR ]]; then
echo "$0: ERROR: cannot find top of git repo directory" 1>&2
- echo "$0: Notice: if needed: $GIT_TOOL clone $REPO_URL; cd $REPO_NAME" 1>&2
+ echo "$0: Notice: if needed: $GIT_TOOL clone $REPO_TOP_URL; cd $REPO_NAME" 1>&2
exit 6
fi
if [[ ! -e $TOPDIR ]]; then
echo "$0: ERROR: TOPDIR does not exist: $TOPDIR" 1>&2
- echo "$0: Notice: if needed: $GIT_TOOL clone $REPO_URL; cd $REPO_NAME" 1>&2
+ echo "$0: Notice: if needed: $GIT_TOOL clone $REPO_TOP_URL; cd $REPO_NAME" 1>&2
exit 6
fi
if [[ ! -d $TOPDIR ]]; then
echo "$0: ERROR: TOPDIR is not a directory: $TOPDIR" 1>&2
- echo "$0: Notice: if needed: $GIT_TOOL clone $REPO_URL; cd $REPO_NAME" 1>&2
+ echo "$0: Notice: if needed: $GIT_TOOL clone $REPO_TOP_URL; cd $REPO_NAME" 1>&2
exit 6
fi
@@ -429,6 +433,7 @@ if [[ $V_FLAG -ge 3 ]]; then
echo "$0: debug[3]: TOPDIR=$TOPDIR" 1>&2
echo "$0: debug[3]: PANDOC_WRAPPER=$PANDOC_WRAPPER" 1>&2
echo "$0: debug[3]: DOCROOT_SLASH=$DOCROOT_SLASH" 1>&2
+ echo "$0: debug[3]: REPO_TOP_URL=$REPO_TOP_URL" 1>&2
echo "$0: debug[3]: REPO_URL=$REPO_URL" 1>&2
echo "$0: debug[3]: SITE_URL=$SITE_URL" 1>&2
echo "$0: debug[3]: URL=$URL" 1>&2
diff --git a/bin/output-year-index.sh b/bin/output-year-index.sh
index 056c4e8cc..1bae3a4c9 100755
--- a/bin/output-year-index.sh
+++ b/bin/output-year-index.sh
@@ -110,7 +110,7 @@ shopt -s globstar # enable ** to match all files and zero or more directories an
# set variables referenced in the usage message
#
-export VERSION="1.4.2 2024-07-07"
+export VERSION="1.4.3 2024-07-28"
NAME=$(basename "$0")
export NAME
export V_FLAG=0
@@ -127,14 +127,16 @@ if [[ $status -eq 0 ]]; then
fi
export TOPDIR
export DOCROOT_SLASH="../../"
-export REPO_URL="https://github.com/ioccc-src/temp-test-ioccc/blob/master"
+export REPO_TOP_URL="https://github.com/ioccc-src/temp-test-ioccc"
+# GitHub puts individual files under the "blob/master" sub-directory.
+export REPO_URL="$REPO_TOP_URL/blob/master"
export SITE_URL="https://ioccc-src.github.io/temp-test-ioccc"
export PANDOC_WRAPPER="bin/pandoc-wrapper.sh"
# set usage message
#
export USAGE="usage: $0 [-h] [-v level] [-V] [-d topdir] [-n] [-N]
- [-p tool] [-u repo_url] [-U URL] [-w site_url] [-e string ..] [-E exitcode]
+ [-p tool] [-u repo_top_url] [-U URL] [-w site_url] [-e string ..] [-E exitcode]
YYYY [more_options]
-h print help message and exit
@@ -150,7 +152,7 @@ export USAGE="usage: $0 [-h] [-v level] [-V] [-d topdir] [-n] [-N]
-p tool run 'pandoc wrapper tool' (not pandoc path) during HTML phase number 21 (def: use $PANDOC_WRAPPER)
- -u repo_url Base level URL of target git repo (def: $REPO_URL)
+ -u repo_top_url Top level URL of target git repo (def: $REPO_TOP_URL)
-U url URL of HTML file being formed (def: $URL)
-w site_url Base URL of the website (def: $SITE_URL)
@@ -323,7 +325,9 @@ while getopts :hv:Vd:D:nNp:u:U:w:e:E: flag; do
;;
p) PANDOC_WRAPPER="$OPTARG"
;;
- u) REPO_URL="$OPTARG"
+ u) REPO_TOP_URL="$OPTARG"
+ # GitHub puts individual files under the "blob/master" sub-directory.
+ export REPO_URL="$REPO_TOP_URL/blob/master"
;;
U) URL="$OPTARG"
;;
@@ -375,21 +379,21 @@ fi
# verify that we have a topdir directory
#
-REPO_NAME=$(basename "$REPO_URL")
+REPO_NAME=$(basename "$REPO_TOP_URL")
export REPO_NAME
if [[ -z $TOPDIR ]]; then
echo "$0: ERROR: cannot find top of git repo directory" 1>&2
- echo "$0: Notice: if needed: $GIT_TOOL clone $REPO_URL; cd $REPO_NAME" 1>&2
+ echo "$0: Notice: if needed: $GIT_TOOL clone $REPO_TOP_URL; cd $REPO_NAME" 1>&2
exit 6
fi
if [[ ! -e $TOPDIR ]]; then
echo "$0: ERROR: TOPDIR does not exist: $TOPDIR" 1>&2
- echo "$0: Notice: if needed: $GIT_TOOL clone $REPO_URL; cd $REPO_NAME" 1>&2
+ echo "$0: Notice: if needed: $GIT_TOOL clone $REPO_TOP_URL; cd $REPO_NAME" 1>&2
exit 6
fi
if [[ ! -d $TOPDIR ]]; then
echo "$0: ERROR: TOPDIR is not a directory: $TOPDIR" 1>&2
- echo "$0: Notice: if needed: $GIT_TOOL clone $REPO_URL; cd $REPO_NAME" 1>&2
+ echo "$0: Notice: if needed: $GIT_TOOL clone $REPO_TOP_URL; cd $REPO_NAME" 1>&2
exit 6
fi
@@ -506,6 +510,7 @@ if [[ $V_FLAG -ge 3 ]]; then
echo "$0: debug[3]: GIT_TOOL=$GIT_TOOL" 1>&2
echo "$0: debug[3]: TOPDIR=$TOPDIR" 1>&2
echo "$0: debug[3]: DOCROOT_SLASH=$DOCROOT_SLASH" 1>&2
+ echo "$0: debug[3]: REPO_TOP_URL=$REPO_TOP_URL" 1>&2
echo "$0: debug[3]: REPO_URL=$REPO_URL" 1>&2
echo "$0: debug[3]: SITE_URL=$SITE_URL" 1>&2
echo "$0: debug[3]: NOOP=$NOOP" 1>&2
diff --git a/bin/pandoc-wrapper.sh b/bin/pandoc-wrapper.sh
index 59bb3900b..f634389b1 100755
--- a/bin/pandoc-wrapper.sh
+++ b/bin/pandoc-wrapper.sh
@@ -99,7 +99,7 @@ shopt -s globstar # enable ** to match all files and zero or more directories an
# set variables referenced in the usage message
#
-export VERSION="1.7 2024-06-22"
+export VERSION="1.7.1 2024-07-28"
NAME=$(basename "$0")
export NAME
export V_FLAG=0
@@ -136,12 +136,14 @@ PANDOC_OPTION+=("html5")
PANDOC_OPTION+=("--wrap=preserve")
PANDOC_OPTION+=("--fail-if-warnings")
PANDOC_OPTION+=("--tab-stop=8")
-export REPO_URL="https://github.com/ioccc-src/temp-test-ioccc/blob/master"
+export REPO_TOP_URL="https://github.com/ioccc-src/temp-test-ioccc"
+# GitHub puts individual files under the "blob/master" sub-directory.
+export REPO_URL="$REPO_TOP_URL/blob/master"
# set usage message
#
export USAGE="usage: $0 [-h] [-v level] [-V] [-d topdir] [-n] [-N]
- [-p pandoc_tool] [-u repo_url] [-e string ..] [-E exitcode]
+ [-p pandoc_tool] [-u repo_top_url] [-e string ..] [-E exitcode]
file.md output.html
-h print help message and exit
@@ -155,7 +157,7 @@ export USAGE="usage: $0 [-h] [-v level] [-V] [-d topdir] [-n] [-N]
-p pandoc_tool path to the pandoc tool (not the wrapper) (def: $PANDOC_TOOL)
- -u repo_url Base level URL of target git repo (def: $REPO_URL)
+ -u repo_top_url Top level URL of target git repo (def: $REPO_TOP_URL)
-e string output string, followed by newline, to stderr (def: do not)
-E exitcode force exit with exitcode (def: exit based on success or failure of the action)
@@ -203,7 +205,9 @@ while getopts :hv:Vd:nNp:u:e:E: flag; do
;;
p) PANDOC_TOOL="$OPTARG"
;;
- u) REPO_URL="$OPTARG"
+ u) REPO_TOP_URL="$OPTARG"
+ # GitHub puts individual files under the "blob/master" sub-directory.
+ export REPO_URL="$REPO_TOP_URL/blob/master"
;;
e) echo "$OPTARG" 1>&2
;;
@@ -283,21 +287,21 @@ export PANDOC_MIN_VERSION="3.1.12.2"
# verify that we have a topdir directory
#
-REPO_NAME=$(basename "$REPO_URL")
+REPO_NAME=$(basename "$REPO_TOP_URL")
export REPO_NAME
if [[ -z $TOPDIR ]]; then
echo "$0: ERROR: cannot find top of git repo directory" 1>&2
- echo "$0: Notice: if needed: $GIT_TOOL clone $REPO_URL; cd $REPO_NAME" 1>&2
+ echo "$0: Notice: if needed: $GIT_TOOL clone $REPO_TOP_URL; cd $REPO_NAME" 1>&2
exit 6
fi
if [[ ! -e $TOPDIR ]]; then
echo "$0: ERROR: TOPDIR does not exist: $TOPDIR" 1>&2
- echo "$0: Notice: if needed: $GIT_TOOL clone $REPO_URL; cd $REPO_NAME" 1>&2
+ echo "$0: Notice: if needed: $GIT_TOOL clone $REPO_TOP_URL; cd $REPO_NAME" 1>&2
exit 6
fi
if [[ ! -d $TOPDIR ]]; then
echo "$0: ERROR: TOPDIR is not a directory: $TOPDIR" 1>&2
- echo "$0: Notice: if needed: $GIT_TOOL clone $REPO_URL; cd $REPO_NAME" 1>&2
+ echo "$0: Notice: if needed: $GIT_TOOL clone $REPO_TOP_URL; cd $REPO_NAME" 1>&2
exit 6
fi
@@ -365,6 +369,7 @@ if [[ $V_FLAG -ge 3 ]]; then
for index in "${!PANDOC_OPTION[@]}"; do
echo "$0: debug[3]: PANDOC_OPTION[$index]=${PANDOC_OPTION[$index]}" 1>&2
done
+ echo "$0: debug[3]: REPO_TOP_URL=$REPO_TOP_URL" 1>&2
echo "$0: debug[3]: REPO_URL=$REPO_URL" 1>&2
echo "$0: debug[3]: NOOP=$NOOP" 1>&2
echo "$0: debug[3]: DO_NOT_PROCESS=$DO_NOT_PROCESS" 1>&2
diff --git a/bin/quick-readme2index.sh b/bin/quick-readme2index.sh
index 240685967..3b5ad5b2e 100755
--- a/bin/quick-readme2index.sh
+++ b/bin/quick-readme2index.sh
@@ -92,7 +92,7 @@ shopt -s globstar # enable ** to match all files and zero or more directories an
# set variables referenced in the usage message
#
-export VERSION="1.1.5 2024-05-19"
+export VERSION="1.1.6 2024-07-28"
NAME=$(basename "$0")
export NAME
export V_FLAG=0
@@ -120,7 +120,9 @@ export DOCROOT_SLASH="../../"
export TAGLINE="bin/readme2index.sh"
export MD2HTML_SH="bin/md2html.sh"
export PANDOC_WRAPPER="bin/pandoc-wrapper.sh"
-export REPO_URL="https://github.com/ioccc-src/temp-test-ioccc/blob/master"
+export REPO_TOP_URL="https://github.com/ioccc-src/temp-test-ioccc"
+# GitHub puts individual files under the "blob/master" sub-directory.
+export REPO_URL="$REPO_TOP_URL/blob/master"
export SITE_URL="https://ioccc-src.github.io/temp-test-ioccc"
#
export NOOP=
@@ -135,7 +137,7 @@ declare -ag TOOL_OPTION
# usage
#
export USAGE="usage: $0 [-h] [-v level] [-V] [-d topdir] [-D docroot/] [-n] [-N]
- [-t tagline] [-T md2html.sh] [-p tool] [-u repo_url] [-w site_url]
+ [-t tagline] [-T md2html.sh] [-p tool] [-u repo_top_url] [-w site_url]
tool [more_options]
-h print help message and exit
@@ -156,15 +158,15 @@ export USAGE="usage: $0 [-h] [-v level] [-V] [-d topdir] [-D docroot/] [-n] [-N]
-p tool run 'pandoc wrapper tool' (not pandoc path) during HTML phase number 21 (def: use $PANDOC_WRAPPER)
- -u repo_url Base level URL of target git repo (def: $REPO_URL)
- NOTE: The '-u repo_url' is passed as leading options on tool command lines.
+ -u repo_top_url Top level URL of target git repo (def: $REPO_TOP_URL)
+ NOTE: The '-u repo_top_url' is passed as leading options on tool command lines.
-w site_url Base URL of the website (def: $SITE_URL)
NOTE: The '-w site_url' is passed as leading options on tool command lines.
tool the tool to run over all entries
[more_options] additional tool command line options to use before the YYYY/dir argument
-NOTE: Any '-t tagline', '-T md2html.sh', '-p tool', '-u repo_url', '-w site_url'
+NOTE: Any '-t tagline', '-T md2html.sh', '-p tool', '-u repo_top_url', '-w site_url'
are passed to the 'tool' at the beginning of the command line, and
before any optional 'more_options' and before the final YYYY/dir argument.
@@ -240,9 +242,9 @@ while getopts :hv:Vd:D:nNt:T:p:u:w: flag; do
TOOL_OPTION+=("-p")
TOOL_OPTION+=("$PANDOC_WRAPPER")
;;
- u) REPO_URL="$OPTARG"
+ u) REPO_TOP_URL="$OPTARG"
TOOL_OPTION+=("-u")
- TOOL_OPTION+=("$REPO_URL")
+ TOOL_OPTION+=("$REPO_TOP_URL")
;;
w) SITE_URL="$OPTARG"
TOOL_OPTION+=("-w")
@@ -299,21 +301,21 @@ fi
# verify that we have a topdir directory
#
-REPO_NAME=$(basename "$REPO_URL")
+REPO_NAME=$(basename "$REPO_TOP_URL")
export REPO_NAME
if [[ -z $TOPDIR ]]; then
echo "$0: ERROR: cannot find top of git repo directory" 1>&2
- echo "$0: Notice: if needed: $GIT_TOOL clone $REPO_URL; cd $REPO_NAME" 1>&2
+ echo "$0: Notice: if needed: $GIT_TOOL clone $REPO_TOP_URL; cd $REPO_NAME" 1>&2
exit 6
fi
if [[ ! -e $TOPDIR ]]; then
echo "$0: ERROR: TOPDIR does not exist: $TOPDIR" 1>&2
- echo "$0: Notice: if needed: $GIT_TOOL clone $REPO_URL; cd $REPO_NAME" 1>&2
+ echo "$0: Notice: if needed: $GIT_TOOL clone $REPO_TOP_URL; cd $REPO_NAME" 1>&2
exit 6
fi
if [[ ! -d $TOPDIR ]]; then
echo "$0: ERROR: TOPDIR is not a directory: $TOPDIR" 1>&2
- echo "$0: Notice: if needed: $GIT_TOOL clone $REPO_URL; cd $REPO_NAME" 1>&2
+ echo "$0: Notice: if needed: $GIT_TOOL clone $REPO_TOP_URL; cd $REPO_NAME" 1>&2
exit 6
fi
@@ -489,6 +491,7 @@ if [[ $V_FLAG -ge 3 ]]; then
echo "$0: debug[3]: TAGLINE=$TAGLINE" 1>&2
echo "$0: debug[3]: MD2HTML_SH=$MD2HTML_SH" 1>&2
echo "$0: debug[3]: PANDOC_WRAPPER=$PANDOC_WRAPPER" 1>&2
+ echo "$0: debug[3]: REPO_TOP_URL=$REPO_TOP_URL" 1>&2
echo "$0: debug[3]: REPO_URL=$REPO_URL" 1>&2
echo "$0: debug[3]: SITE_URL=$SITE_URL" 1>&2
echo "$0: debug[3]: NOOP=$NOOP" 1>&2
diff --git a/bin/readme2index.sh b/bin/readme2index.sh
index 1674cbf91..36e2c145f 100755
--- a/bin/readme2index.sh
+++ b/bin/readme2index.sh
@@ -86,7 +86,7 @@ shopt -s globstar # enable ** to match all files and zero or more directories an
# set variables referenced in the usage message
#
-export VERSION="1.2.5 2024-05-19"
+export VERSION="1.2.6 2024-07-28"
NAME=$(basename "$0")
export NAME
export V_FLAG=0
@@ -106,7 +106,9 @@ export DOCROOT_SLASH="../../"
export TAGLINE="bin/$NAME"
export MD2HTML_SH="bin/md2html.sh"
export PANDOC_WRAPPER="bin/pandoc-wrapper.sh"
-export REPO_URL="https://github.com/ioccc-src/temp-test-ioccc/blob/master"
+export REPO_TOP_URL="https://github.com/ioccc-src/temp-test-ioccc"
+# GitHub puts individual files under the "blob/master" sub-directory.
+export REPO_URL="$REPO_TOP_URL/blob/master"
export SITE_URL="https://ioccc-src.github.io/temp-test-ioccc"
#
export NOOP=
@@ -122,7 +124,7 @@ declare -ag TOOL_OPTION
#
export USAGE="usage: $0 [-h] [-v level] [-V] [-d topdir] [-D docroot/] [-n] [-N]
[-t tagline] [-T md2html.sh] [-p tool]
- [-u repo_url] [-w site_url] [-e string ..] [-E exitcode]
+ [-u repo_top_url] [-w site_url] [-e string ..] [-E exitcode]
YYYY/dir
-h print help message and exit
@@ -147,8 +149,8 @@ export USAGE="usage: $0 [-h] [-v level] [-V] [-d topdir] [-D docroot/] [-n] [-N]
-p . skip HTML phase number 21 (def: do nothing during HTML phase number 21)
NOTE: The '-p tool' will be passed as leading options on the -b tool and -a tool command lines.
- -u repo_url Base level URL of target git repo (def: $REPO_URL)
- NOTE: The '-u repo_url' is passed as leading options on tool command lines.
+ -u repo_top_url Top level URL of target git repo (def: $REPO_TOP_URL)
+ NOTE: The '-u repo_top_url' is passed as leading options on tool command lines.
-w site_url Base URL of the website (def: $SITE_URL)
NOTE: The '-w site_url' is passed as leading options on tool command lines.
@@ -156,7 +158,7 @@ export USAGE="usage: $0 [-h] [-v level] [-V] [-d topdir] [-D docroot/] [-n] [-N]
NOTE: The '-v level' is passed as initial command line options to the 'markdown to html tool' (md2html.sh).
The 'tagline' is passed as '-t tagline' to the 'markdown to html tool' (md2html.sh), after the '-v level'.
- Any '-T md2html.sh', '-p tool', '-P pandoc_opts', '-u repo_url', '-U top_url'
+ Any '-T md2html.sh', '-p tool', '-P pandoc_opts', '-u repo_top_url', '-U top_url'
are passed to the 'markdown to html tool' (md2html.sh), and will be before any command line arguments.
Exit codes:
@@ -233,9 +235,9 @@ while getopts :hv:Vd:D:nNt:T:p:u:w: flag; do
TOOL_OPTION+=("-p")
TOOL_OPTION+=("$PANDOC_WRAPPER")
;;
- u) REPO_URL="$OPTARG"
+ u) REPO_TOP_URL="$OPTARG"
TOOL_OPTION+=("-u")
- TOOL_OPTION+=("$REPO_URL")
+ TOOL_OPTION+=("$REPO_TOP_URL")
;;
w) SITE_URL="$OPTARG"
TOOL_OPTION+=("-w")
@@ -292,21 +294,21 @@ fi
# verify that we have a topdir directory
#
-REPO_NAME=$(basename "$REPO_URL")
+REPO_NAME=$(basename "$REPO_TOP_URL")
export REPO_NAME
if [[ -z $TOPDIR ]]; then
echo "$0: ERROR: cannot find top of git repo directory" 1>&2
- echo "$0: Notice: if needed: $GIT_TOOL clone $REPO_URL; cd $REPO_NAME" 1>&2
+ echo "$0: Notice: if needed: $GIT_TOOL clone $REPO_TOP_URL; cd $REPO_NAME" 1>&2
exit 6
fi
if [[ ! -e $TOPDIR ]]; then
echo "$0: ERROR: TOPDIR does not exist: $TOPDIR" 1>&2
- echo "$0: Notice: if needed: $GIT_TOOL clone $REPO_URL; cd $REPO_NAME" 1>&2
+ echo "$0: Notice: if needed: $GIT_TOOL clone $REPO_TOP_URL; cd $REPO_NAME" 1>&2
exit 6
fi
if [[ ! -d $TOPDIR ]]; then
echo "$0: ERROR: TOPDIR is not a directory: $TOPDIR" 1>&2
- echo "$0: Notice: if needed: $GIT_TOOL clone $REPO_URL; cd $REPO_NAME" 1>&2
+ echo "$0: Notice: if needed: $GIT_TOOL clone $REPO_TOP_URL; cd $REPO_NAME" 1>&2
exit 6
fi
@@ -468,6 +470,7 @@ if [[ $V_FLAG -ge 3 ]]; then
echo "$0: debug[3]: TAGLINE=$TAGLINE" 1>&2
echo "$0: debug[3]: MD2HTML_SH=$MD2HTML_SH" 1>&2
echo "$0: debug[3]: PANDOC_WRAPPER=$PANDOC_WRAPPER" 1>&2
+ echo "$0: debug[3]: REPO_TOP_URL=$REPO_TOP_URL" 1>&2
echo "$0: debug[3]: REPO_URL=$REPO_URL" 1>&2
echo "$0: debug[3]: SITE_URL=$SITE_URL" 1>&2
echo "$0: debug[3]: NOOP=$NOOP" 1>&2
diff --git a/bin/sort.gitignore.sh b/bin/sort.gitignore.sh
index 1cab24cb2..790576e99 100755
--- a/bin/sort.gitignore.sh
+++ b/bin/sort.gitignore.sh
@@ -99,7 +99,7 @@ shopt -s globstar # enable ** to match all files and zero or more directories an
# set variables referenced in the usage message
#
-export VERSION="1.1.7 2024-04-28"
+export VERSION="1.1.8 2024-07-28"
NAME=$(basename "$0")
export NAME
export V_FLAG=0
@@ -115,7 +115,9 @@ if [[ $status -eq 0 ]]; then
TOPDIR=$("$GIT_TOOL" rev-parse --show-toplevel)
fi
export TOPDIR
-export REPO_URL="https://github.com/ioccc-src/temp-test-ioccc/blob/master"
+export REPO_TOP_URL="https://github.com/ioccc-src/temp-test-ioccc"
+# GitHub puts individual files under the "blob/master" sub-directory.
+export REPO_URL="$REPO_TOP_URL/blob/master"
export TOP_URL="https://ioccc-src.github.io/temp-test-ioccc"
export SGI_TOOL="bin/sgi.sh"
@@ -209,16 +211,21 @@ export ENTRY_PATH="$1"
# verify that we have a topdir directory
#
-REPO_NAME=$(basename "$REPO_URL")
+REPO_NAME=$(basename "$REPO_TOP_URL")
export REPO_NAME
if [[ -z $TOPDIR ]]; then
echo "$0: ERROR: cannot find top of git repo directory" 1>&2
- echo "$0: Notice: if needed: $GIT_TOOL clone $REPO_URL; cd $REPO_NAME" 1>&2
+ echo "$0: Notice: if needed: $GIT_TOOL clone $REPO_TOP_URL; cd $REPO_NAME" 1>&2
+ exit 6
+fi
+if [[ ! -e $TOPDIR ]]; then
+ echo "$0: ERROR: TOPDIR does not exist: $TOPDIR" 1>&2
+ echo "$0: Notice: if needed: $GIT_TOOL clone $REPO_TOP_URL; cd $REPO_NAME" 1>&2
exit 6
fi
if [[ ! -d $TOPDIR ]]; then
echo "$0: ERROR: TOPDIR is not a directory: $TOPDIR" 1>&2
- echo "$0: Notice: if needed: $GIT_TOOL clone $REPO_URL; cd $REPO_NAME" 1>&2
+ echo "$0: Notice: if needed: $GIT_TOOL clone $REPO_TOP_URL; cd $REPO_NAME" 1>&2
exit 6
fi
@@ -366,6 +373,7 @@ if [[ $V_FLAG -ge 3 ]]; then
echo "$0: debug[3]: V_FLAG=$V_FLAG" 1>&2
echo "$0: debug[3]: GIT_TOOL=$GIT_TOOL" 1>&2
echo "$0: debug[3]: TOPDIR=$TOPDIR" 1>&2
+ echo "$0: debug[3]: REPO_TOP_URL=$REPO_TOP_URL" 1>&2
echo "$0: debug[3]: REPO_URL=$REPO_URL" 1>&2
echo "$0: debug[3]: TOP_URL=$TOP_URL" 1>&2
echo "$0: debug[3]: SGI_TOOL=$SGI_TOOL" 1>&2
diff --git a/bin/status2html.sh b/bin/status2html.sh
index a738a7d1f..92390b4da 100755
--- a/bin/status2html.sh
+++ b/bin/status2html.sh
@@ -101,7 +101,7 @@ shopt -s globstar # enable ** to match all files and zero or more directories an
# set variables referenced in the usage message
#
-export VERSION="1.4.1 2024-04-28"
+export VERSION="1.4.2 2024-07-28"
NAME=$(basename "$0")
export NAME
export V_FLAG=0
@@ -119,14 +119,16 @@ fi
export TOPDIR
export DOCROOT_SLASH="./"
export PANDOC_WRAPPER="bin/pandoc-wrapper.sh"
-export REPO_URL="https://github.com/ioccc-src/temp-test-ioccc/blob/master"
+export REPO_TOP_URL="https://github.com/ioccc-src/temp-test-ioccc"
+# GitHub puts individual files under the "blob/master" sub-directory.
+export REPO_URL="$REPO_TOP_URL/blob/master"
export SITE_URL="https://ioccc-src.github.io/temp-test-ioccc"
export URL="#"
# set usage message
#
export USAGE="usage: $0 [-h] [-v level] [-V] [-d topdir] [-D docroot/] [-n] [-N]
- [-p tool] [-u repo_url] [-U url] [-w site_url] [-e string ..] [-E exitcode]
+ [-p tool] [-u repo_top_url] [-U url] [-w site_url] [-e string ..] [-E exitcode]
-h print help message and exit
-v level set verbosity level (def level: 0)
@@ -141,7 +143,7 @@ export USAGE="usage: $0 [-h] [-v level] [-V] [-d topdir] [-D docroot/] [-n] [-N]
-p tool run 'pandoc wrapper tool' (not pandoc path) during HTML phase number 21 (def: use $PANDOC_WRAPPER)
- -u repo_url Base level URL of target git repo (def: $REPO_URL)
+ -u repo_top_url Top level URL of target git repo (def: $REPO_TOP_URL)
-U url URL of HTML file being formed (def: $URL)
-w site_url Base URL of the website (def: $SITE_URL)
@@ -198,7 +200,9 @@ while getopts :hv:Vd:D:nNp:u:U:w:e:E: flag; do
;;
p) PANDOC_WRAPPER="$OPTARG"
;;
- u) REPO_URL="$OPTARG"
+ u) REPO_TOP_URL="$OPTARG"
+ # GitHub puts individual files under the "blob/master" sub-directory.
+ export REPO_URL="$REPO_TOP_URL/blob/master"
;;
U) URL="$OPTARG"
;;
@@ -247,21 +251,21 @@ fi
# verify that we have a topdir directory
#
-REPO_NAME=$(basename "$REPO_URL")
+REPO_NAME=$(basename "$REPO_TOP_URL")
export REPO_NAME
if [[ -z $TOPDIR ]]; then
echo "$0: ERROR: cannot find top of git repo directory" 1>&2
- echo "$0: Notice: if needed: $GIT_TOOL clone $REPO_URL; cd $REPO_NAME" 1>&2
+ echo "$0: Notice: if needed: $GIT_TOOL clone $REPO_TOP_URL; cd $REPO_NAME" 1>&2
exit 6
fi
if [[ ! -e $TOPDIR ]]; then
echo "$0: ERROR: TOPDIR does not exist: $TOPDIR" 1>&2
- echo "$0: Notice: if needed: $GIT_TOOL clone $REPO_URL; cd $REPO_NAME" 1>&2
+ echo "$0: Notice: if needed: $GIT_TOOL clone $REPO_TOP_URL; cd $REPO_NAME" 1>&2
exit 6
fi
if [[ ! -d $TOPDIR ]]; then
echo "$0: ERROR: TOPDIR is not a directory: $TOPDIR" 1>&2
- echo "$0: Notice: if needed: $GIT_TOOL clone $REPO_URL; cd $REPO_NAME" 1>&2
+ echo "$0: Notice: if needed: $GIT_TOOL clone $REPO_TOP_URL; cd $REPO_NAME" 1>&2
exit 6
fi
@@ -342,6 +346,7 @@ if [[ $V_FLAG -ge 3 ]]; then
echo "$0: debug[3]: TOPDIR=$TOPDIR" 1>&2
echo "$0: debug[3]: DOCROOT_SLASH=$DOCROOT_SLASH" 1>&2
echo "$0: debug[3]: PANDOC_WRAPPER=$PANDOC_WRAPPER" 1>&2
+ echo "$0: debug[3]: REPO_TOP_URL=$REPO_TOP_URL" 1>&2
echo "$0: debug[3]: REPO_URL=$REPO_URL" 1>&2
echo "$0: debug[3]: SITE_URL=$SITE_URL" 1>&2
echo "$0: debug[3]: URL=$URL" 1>&2
diff --git a/bin/subst.default.sh b/bin/subst.default.sh
index d3f19066a..7228ad17d 100755
--- a/bin/subst.default.sh
+++ b/bin/subst.default.sh
@@ -92,7 +92,7 @@ shopt -s globstar # enable ** to match all files and zero or more directories an
# set variables referenced in the usage message
#
-export VERSION="1.3 2024-04-20"
+export VERSION="1.3.1 2024-07-28"
NAME=$(basename "$0")
export NAME
export V_FLAG=0
@@ -109,14 +109,16 @@ if [[ $status -eq 0 ]]; then
fi
export TOPDIR
export DOCROOT_SLASH="../../"
-export REPO_URL="https://github.com/ioccc-src/temp-test-ioccc/blob/master"
+export REPO_TOP_URL="https://github.com/ioccc-src/temp-test-ioccc"
+# GitHub puts individual files under the "blob/master" sub-directory.
+export REPO_URL="$REPO_TOP_URL/blob/master"
export SITE_URL="https://ioccc-src.github.io/temp-test-ioccc"
export URL="#"
# set usage message
#
export USAGE="usage: $0 [-h] [-v level] [-V] [-d topdir] [-D docroot/] [-n] [-N]
- [-u repo_url] [-U url] [-w site_url] [-e string ..] [-E exitcode]
+ [-u repo_top_url] [-U url] [-w site_url] [-e string ..] [-E exitcode]
[ignored]
-h print help message and exit
@@ -130,7 +132,7 @@ export USAGE="usage: $0 [-h] [-v level] [-V] [-d topdir] [-D docroot/] [-n] [-N]
-n go thru the actions, but do not update any files (def: do the action)
-N do not process file, just parse arguments and ignore the file (def: process the file)
- -u repo_url Base level URL of target git repo (def: $REPO_URL)
+ -u repo_top_url Top level URL of target git repo (def: $REPO_TOP_URL)
-U url URL of HTML file being formed (def: $URL)
-w site_url Base URL of the website (def: $SITE_URL)
@@ -184,7 +186,9 @@ while getopts :hv:Vd:D:nNu:U:w:e:E: flag; do
;;
N) DO_NOT_PROCESS="-N"
;;
- u) REPO_URL="$OPTARG"
+ u) REPO_TOP_URL="$OPTARG"
+ # GitHub puts individual files under the "blob/master" sub-directory.
+ export REPO_URL="$REPO_TOP_URL/blob/master"
;;
U) URL="$OPTARG"
;;
@@ -238,6 +242,7 @@ if [[ $V_FLAG -ge 3 ]]; then
echo "$0: debug[3]: GIT_TOOL=$GIT_TOOL" 1>&2
echo "$0: debug[3]: TOPDIR=$TOPDIR" 1>&2
echo "$0: debug[3]: DOCROOT_SLASH=$DOCROOT_SLASH" 1>&2
+ echo "$0: debug[3]: REPO_TOP_URL=$REPO_TOP_URL" 1>&2
echo "$0: debug[3]: REPO_URL=$REPO_URL" 1>&2
echo "$0: debug[3]: SITE_URL=$SITE_URL" 1>&2
echo "$0: debug[3]: URL=$URL" 1>&2
diff --git a/bin/subst.entry-index.sh b/bin/subst.entry-index.sh
index e8f6248f6..00b5d6df8 100755
--- a/bin/subst.entry-index.sh
+++ b/bin/subst.entry-index.sh
@@ -103,7 +103,7 @@ shopt -s globstar # enable ** to match all files and zero or more directories an
# set variables referenced in the usage message
#
-export VERSION="1.3.3 2024-04-13"
+export VERSION="1.3.4 2024-07-28"
NAME=$(basename "$0")
export NAME
export V_FLAG=0
@@ -120,13 +120,15 @@ if [[ $status -eq 0 ]]; then
fi
export TOPDIR
export DOCROOT_SLASH="../../"
-export REPO_URL="https://github.com/ioccc-src/temp-test-ioccc/blob/master"
+export REPO_TOP_URL="https://github.com/ioccc-src/temp-test-ioccc"
+# GitHub puts individual files under the "blob/master" sub-directory.
+export REPO_URL="$REPO_TOP_URL/blob/master"
export SITE_URL="https://ioccc-src.github.io/temp-test-ioccc"
# set usage message
#
export USAGE="usage: $0 [-h] [-v level] [-V] [-d topdir] [-n] [-N]
- [-u repo_url] [-U URL] [-w site_url] [-e string ..] [-E exitcode]
+ [-u repo_top_url] [-U URL] [-w site_url] [-e string ..] [-E exitcode]
YYYY/dir
-h print help message and exit
@@ -140,7 +142,7 @@ export USAGE="usage: $0 [-h] [-v level] [-V] [-d topdir] [-n] [-N]
-n go thru the actions, but do not update any files (def: do the action)
-N do not process file, just parse arguments and ignore the file (def: process the file)
- -u repo_url Base level URL of target git repo (def: $REPO_URL)
+ -u repo_top_url Top level URL of target git repo (def: $REPO_TOP_URL)
-U url URL of HTML file being formed (def: $URL)
-w site_url Base URL of the website (def: $SITE_URL)
@@ -247,7 +249,9 @@ while getopts :hv:Vd:D:nNu:U:w:e:E: flag; do
;;
N) DO_NOT_PROCESS="-N"
;;
- u) REPO_URL="$OPTARG"
+ u) REPO_TOP_URL="$OPTARG"
+ # GitHub puts individual files under the "blob/master" sub-directory.
+ export REPO_URL="$REPO_TOP_URL/blob/master"
;;
U) URL="$OPTARG"
;;
@@ -295,21 +299,21 @@ export ENTRY_PATH="$1"
# verify that we have a topdir directory
#
-REPO_NAME=$(basename "$REPO_URL")
+REPO_NAME=$(basename "$REPO_TOP_URL")
export REPO_NAME
if [[ -z $TOPDIR ]]; then
echo "$0: ERROR: cannot find top of git repo directory" 1>&2
- echo "$0: Notice: if needed: $GIT_TOOL clone $REPO_URL; cd $REPO_NAME" 1>&2
+ echo "$0: Notice: if needed: $GIT_TOOL clone $REPO_TOP_URL; cd $REPO_NAME" 1>&2
exit 6
fi
if [[ ! -e $TOPDIR ]]; then
echo "$0: ERROR: TOPDIR does not exist: $TOPDIR" 1>&2
- echo "$0: Notice: if needed: $GIT_TOOL clone $REPO_URL; cd $REPO_NAME" 1>&2
+ echo "$0: Notice: if needed: $GIT_TOOL clone $REPO_TOP_URL; cd $REPO_NAME" 1>&2
exit 6
fi
if [[ ! -d $TOPDIR ]]; then
echo "$0: ERROR: TOPDIR is not a directory: $TOPDIR" 1>&2
- echo "$0: Notice: if needed: $GIT_TOOL clone $REPO_URL; cd $REPO_NAME" 1>&2
+ echo "$0: Notice: if needed: $GIT_TOOL clone $REPO_TOP_URL; cd $REPO_NAME" 1>&2
exit 6
fi
@@ -470,6 +474,7 @@ if [[ $V_FLAG -ge 3 ]]; then
echo "$0: debug[3]: GIT_TOOL=$GIT_TOOL" 1>&2
echo "$0: debug[3]: TOPDIR=$TOPDIR" 1>&2
echo "$0: debug[3]: DOCROOT_SLASH=$DOCROOT_SLASH" 1>&2
+ echo "$0: debug[3]: REPO_TOP_URL=$REPO_TOP_URL" 1>&2
echo "$0: debug[3]: REPO_URL=$REPO_URL" 1>&2
echo "$0: debug[3]: SITE_URL=$SITE_URL" 1>&2
echo "$0: debug[3]: NOOP=$NOOP" 1>&2
diff --git a/bin/subst.year-index.sh b/bin/subst.year-index.sh
index fc947b48e..becdc2ff0 100755
--- a/bin/subst.year-index.sh
+++ b/bin/subst.year-index.sh
@@ -103,7 +103,7 @@ shopt -s globstar # enable ** to match all files and zero or more directories an
# set variables referenced in the usage message
#
-export VERSION="1.1.3 2024-04-13"
+export VERSION="1.1.4 2024-07-28"
NAME=$(basename "$0")
export NAME
export V_FLAG=0
@@ -120,13 +120,15 @@ if [[ $status -eq 0 ]]; then
fi
export TOPDIR
export DOCROOT_SLASH="../../"
-export REPO_URL="https://github.com/ioccc-src/temp-test-ioccc/blob/master"
+export REPO_TOP_URL="https://github.com/ioccc-src/temp-test-ioccc"
+# GitHub puts individual files under the "blob/master" sub-directory.
+export REPO_URL="$REPO_TOP_URL/blob/master"
export SITE_URL="https://ioccc-src.github.io/temp-test-ioccc"
# set usage message
#
export USAGE="usage: $0 [-h] [-v level] [-V] [-d topdir] [-n] [-N]
- [-u repo_url] [-U URL] [-w site_url] [-e string ..] [-E exitcode]
+ [-u repo_top_url] [-U URL] [-w site_url] [-e string ..] [-E exitcode]
YYYY
-h print help message and exit
@@ -140,7 +142,7 @@ export USAGE="usage: $0 [-h] [-v level] [-V] [-d topdir] [-n] [-N]
-n go thru the actions, but do not update any files (def: do the action)
-N do not process file, just parse arguments and ignore the file (def: process the file)
- -u repo_url Base level URL of target git repo (def: $REPO_URL)
+ -u repo_top_url Top level URL of target git repo (def: $REPO_TOP_URL)
-U url URL of HTML file being formed (def: $URL)
-w site_url Base URL of the website (def: $SITE_URL)
@@ -257,7 +259,9 @@ while getopts :hv:Vd:D:nNu:U:w:e:E: flag; do
;;
N) DO_NOT_PROCESS="-N"
;;
- u) REPO_URL="$OPTARG"
+ u) REPO_TOP_URL="$OPTARG"
+ # GitHub puts individual files under the "blob/master" sub-directory.
+ export REPO_URL="$REPO_TOP_URL/blob/master"
;;
U) URL="$OPTARG"
;;
@@ -305,21 +309,21 @@ export YEAR_ARG="$1"
# verify that we have a topdir directory
#
-REPO_NAME=$(basename "$REPO_URL")
+REPO_NAME=$(basename "$REPO_TOP_URL")
export REPO_NAME
if [[ -z $TOPDIR ]]; then
echo "$0: ERROR: cannot find top of git repo directory" 1>&2
- echo "$0: Notice: if needed: $GIT_TOOL clone $REPO_URL; cd $REPO_NAME" 1>&2
+ echo "$0: Notice: if needed: $GIT_TOOL clone $REPO_TOP_URL; cd $REPO_NAME" 1>&2
exit 6
fi
if [[ ! -e $TOPDIR ]]; then
echo "$0: ERROR: TOPDIR does not exist: $TOPDIR" 1>&2
- echo "$0: Notice: if needed: $GIT_TOOL clone $REPO_URL; cd $REPO_NAME" 1>&2
+ echo "$0: Notice: if needed: $GIT_TOOL clone $REPO_TOP_URL; cd $REPO_NAME" 1>&2
exit 6
fi
if [[ ! -d $TOPDIR ]]; then
echo "$0: ERROR: TOPDIR is not a directory: $TOPDIR" 1>&2
- echo "$0: Notice: if needed: $GIT_TOOL clone $REPO_URL; cd $REPO_NAME" 1>&2
+ echo "$0: Notice: if needed: $GIT_TOOL clone $REPO_TOP_URL; cd $REPO_NAME" 1>&2
exit 6
fi
@@ -455,6 +459,7 @@ if [[ $V_FLAG -ge 3 ]]; then
echo "$0: debug[3]: GIT_TOOL=$GIT_TOOL" 1>&2
echo "$0: debug[3]: TOPDIR=$TOPDIR" 1>&2
echo "$0: debug[3]: DOCROOT_SLASH=$DOCROOT_SLASH" 1>&2
+ echo "$0: debug[3]: REPO_TOP_URL=$REPO_TOP_URL" 1>&2
echo "$0: debug[3]: REPO_URL=$REPO_URL" 1>&2
echo "$0: debug[3]: SITE_URL=$SITE_URL" 1>&2
echo "$0: debug[3]: NOOP=$NOOP" 1>&2
diff --git a/bin/tar-entry.sh b/bin/tar-entry.sh
index 611f8f74a..0760e3304 100755
--- a/bin/tar-entry.sh
+++ b/bin/tar-entry.sh
@@ -83,7 +83,7 @@ shopt -s globstar # enable ** to match all files and zero or more directories an
# set variables referenced in the usage message
#
-export VERSION="1.3.8 2024-07-23"
+export VERSION="1.3.9 2024-07-28"
NAME=$(basename "$0")
export NAME
export V_FLAG=0
@@ -99,7 +99,9 @@ if [[ $status -eq 0 ]]; then
TOPDIR=$("$GIT_TOOL" rev-parse --show-toplevel)
fi
export TOPDIR
-export REPO_URL="https://github.com/ioccc-src/temp-test-ioccc/blob/master"
+export REPO_TOP_URL="https://github.com/ioccc-src/temp-test-ioccc"
+# GitHub puts individual files under the "blob/master" sub-directory.
+export REPO_URL="$REPO_TOP_URL/blob/master"
export CAP_W_FLAG_FOUND=
GTAR_TOOL=$(type -P gtar)
export GTAR_TOOL
@@ -111,7 +113,7 @@ fi
# set usage message
#
export USAGE="usage: $0 [-h] [-v level] [-V] [-d topdir] [-D docroot/] [-n] [-N]
- [-p tool] [-u repo_url] [-w site_url] [-W]
+ [-p tool] [-u repo_top_url] [-w site_url] [-W]
YYYY/dir
-h print help message and exit
@@ -126,7 +128,7 @@ export USAGE="usage: $0 [-h] [-v level] [-V] [-d topdir] [-D docroot/] [-n] [-N]
-p tool This option is ignored
- -u repo_url This option is ignored
+ -u repo_top_url This option is ignored
-w site_url This option is ignored
-W Warn if a file in the manifest is missing: (def: error if a file is missing)
@@ -216,21 +218,21 @@ export ENTRY_PATH="$1"
# verify that we have a topdir directory
#
-REPO_NAME=$(basename "$REPO_URL")
+REPO_NAME=$(basename "$REPO_TOP_URL")
export REPO_NAME
if [[ -z $TOPDIR ]]; then
echo "$0: ERROR: cannot find top of git repo directory" 1>&2
- echo "$0: Notice: if needed: $GIT_TOOL clone $REPO_URL; cd $REPO_NAME" 1>&2
+ echo "$0: Notice: if needed: $GIT_TOOL clone $REPO_TOP_URL; cd $REPO_NAME" 1>&2
exit 6
fi
if [[ ! -e $TOPDIR ]]; then
echo "$0: ERROR: TOPDIR does not exist: $TOPDIR" 1>&2
- echo "$0: Notice: if needed: $GIT_TOOL clone $REPO_URL; cd $REPO_NAME" 1>&2
+ echo "$0: Notice: if needed: $GIT_TOOL clone $REPO_TOP_URL; cd $REPO_NAME" 1>&2
exit 6
fi
if [[ ! -d $TOPDIR ]]; then
echo "$0: ERROR: TOPDIR is not a directory: $TOPDIR" 1>&2
- echo "$0: Notice: if needed: $GIT_TOOL clone $REPO_URL; cd $REPO_NAME" 1>&2
+ echo "$0: Notice: if needed: $GIT_TOOL clone $REPO_TOP_URL; cd $REPO_NAME" 1>&2
exit 6
fi
@@ -435,6 +437,7 @@ if [[ $V_FLAG -ge 3 ]]; then
echo "$0: debug[3]: V_FLAG=$V_FLAG" 1>&2
echo "$0: debug[3]: GIT_TOOL=$GIT_TOOL" 1>&2
echo "$0: debug[3]: TOPDIR=$TOPDIR" 1>&2
+ echo "$0: debug[3]: REPO_TOP_URL=$REPO_TOP_URL" 1>&2
echo "$0: debug[3]: REPO_URL=$REPO_URL" 1>&2
echo "$0: debug[3]: CAP_W_FLAG_FOUND=$CAP_W_FLAG_FOUND" 1>&2
echo "$0: debug[3]: GTAR_TOOL=$GTAR_TOOL" 1>&2
@@ -582,9 +585,11 @@ if [[ -z $NOOP ]]; then
echo "$0: ERROR: awk -f $FILELIST_ENTRY_JSON_AWK $ENTRY_JSON > $TMP_MANIFEST_LIST failed, error: $status" 1>&2
exit 1
fi
- echo "$IOCCC_CSS" >> "$TMP_MANIFEST_LIST"
- echo "$VAR_MK" >> "$TMP_MANIFEST_LIST"
- echo "$LEET_MK" >> "$TMP_MANIFEST_LIST"
+ {
+ echo "$IOCCC_CSS"
+ echo "$VAR_MK"
+ echo "$LEET_MK"
+ } >> "$TMP_MANIFEST_LIST"
LC_ALL=C sort -d "$TMP_MANIFEST_LIST" -o "$TMP_MANIFEST_LIST"
status="$?"
if [[ $status -ne 0 ]]; then
diff --git a/bin/tar-year.sh b/bin/tar-year.sh
index 058a0a42d..62dd154da 100755
--- a/bin/tar-year.sh
+++ b/bin/tar-year.sh
@@ -83,7 +83,7 @@ shopt -s globstar # enable ** to match all files and zero or more directories an
# set variables referenced in the usage message
-export VERSION="1.2.6 2024-07-23"
+export VERSION="1.2.7 2024-07-28"
NAME=$(basename "$0")
export NAME
export V_FLAG=0
@@ -99,7 +99,9 @@ if [[ $status -eq 0 ]]; then
TOPDIR=$("$GIT_TOOL" rev-parse --show-toplevel)
fi
export TOPDIR
-export REPO_URL="https://github.com/ioccc-src/temp-test-ioccc/blob/master"
+export REPO_TOP_URL="https://github.com/ioccc-src/temp-test-ioccc"
+# GitHub puts individual files under the "blob/master" sub-directory.
+export REPO_URL="$REPO_TOP_URL/blob/master"
export CAP_W_FLAG_FOUND=
GTAR_TOOL=$(type -P gtar)
export GTAR_TOOL
@@ -111,7 +113,7 @@ fi
# set usage message
#
export USAGE="usage: $0 [-h] [-v level] [-V] [-d topdir] [-D docroot/] [-n] [-N]
- [-p tool] [-u repo_url] [-w site_url] [-W]
+ [-p tool] [-u repo_top_url] [-w site_url] [-W]
YYYY
-h print help message and exit
@@ -126,7 +128,7 @@ export USAGE="usage: $0 [-h] [-v level] [-V] [-d topdir] [-D docroot/] [-n] [-N]
-p tool This option is ignored
- -u repo_url This option is ignored
+ -u repo_top_url This option is ignored
-w site_url This option is ignored
-W Warn if a file in the manifest is missing: (def: error if a file is missing)
@@ -216,21 +218,21 @@ export YYYY="$1"
# verify that we have a topdir directory
#
-REPO_NAME=$(basename "$REPO_URL")
+REPO_NAME=$(basename "$REPO_TOP_URL")
export REPO_NAME
if [[ -z $TOPDIR ]]; then
echo "$0: ERROR: cannot find top of git repo directory" 1>&2
- echo "$0: Notice: if needed: $GIT_TOOL clone $REPO_URL; cd $REPO_NAME" 1>&2
+ echo "$0: Notice: if needed: $GIT_TOOL clone $REPO_TOP_URL; cd $REPO_NAME" 1>&2
exit 6
fi
if [[ ! -e $TOPDIR ]]; then
echo "$0: ERROR: TOPDIR does not exist: $TOPDIR" 1>&2
- echo "$0: Notice: if needed: $GIT_TOOL clone $REPO_URL; cd $REPO_NAME" 1>&2
+ echo "$0: Notice: if needed: $GIT_TOOL clone $REPO_TOP_URL; cd $REPO_NAME" 1>&2
exit 6
fi
if [[ ! -d $TOPDIR ]]; then
echo "$0: ERROR: TOPDIR is not a directory: $TOPDIR" 1>&2
- echo "$0: Notice: if needed: $GIT_TOOL clone $REPO_URL; cd $REPO_NAME" 1>&2
+ echo "$0: Notice: if needed: $GIT_TOOL clone $REPO_TOP_URL; cd $REPO_NAME" 1>&2
exit 6
fi
@@ -382,6 +384,7 @@ if [[ $V_FLAG -ge 3 ]]; then
echo "$0: debug[3]: V_FLAG=$V_FLAG" 1>&2
echo "$0: debug[3]: GIT_TOOL=$GIT_TOOL" 1>&2
echo "$0: debug[3]: TOPDIR=$TOPDIR" 1>&2
+ echo "$0: debug[3]: REPO_TOP_URL=$REPO_TOP_URL" 1>&2
echo "$0: debug[3]: REPO_URL=$REPO_URL" 1>&2
echo "$0: debug[3]: CAP_W_FLAG_FOUND=$CAP_W_FLAG_FOUND" 1>&2
echo "$0: debug[3]: GTAR_TOOL=$GTAR_TOOL" 1>&2
diff --git a/bin/untar-entry.sh b/bin/untar-entry.sh
index f247c6b0d..163034de4 100755
--- a/bin/untar-entry.sh
+++ b/bin/untar-entry.sh
@@ -83,7 +83,7 @@ shopt -s globstar # enable ** to match all files and zero or more directories an
# set variables referenced in the usage message
#
-export VERSION="1.0.2 2024-04-13"
+export VERSION="1.0.3 2024-07-28"
NAME=$(basename "$0")
export NAME
export V_FLAG=0
@@ -99,7 +99,9 @@ if [[ $status -eq 0 ]]; then
TOPDIR=$("$GIT_TOOL" rev-parse --show-toplevel)
fi
export TOPDIR
-export REPO_URL="https://github.com/ioccc-src/temp-test-ioccc/blob/master"
+export REPO_TOP_URL="https://github.com/ioccc-src/temp-test-ioccc"
+# GitHub puts individual files under the "blob/master" sub-directory.
+export REPO_URL="$REPO_TOP_URL/blob/master"
export CAP_W_FLAG_FOUND=
GTAR_TOOL=$(type -P gtar)
export GTAR_TOOL
@@ -111,7 +113,7 @@ fi
# set usage message
#
export USAGE="usage: $0 [-h] [-v level] [-V] [-d topdir] [-D docroot/] [-n] [-N]
- [-p tool] [-u repo_url] [-w site_url] [-W]
+ [-p tool] [-u repo_top_url] [-w site_url] [-W]
YYYY/dir
-h print help message and exit
@@ -126,7 +128,7 @@ export USAGE="usage: $0 [-h] [-v level] [-V] [-d topdir] [-D docroot/] [-n] [-N]
-p tool This option is ignored
- -u repo_url This option is ignored
+ -u repo_top_url This option is ignored
-w site_url This option is ignored
-W Warn if a file in the manifest is missing: (def: error if a file is missing)
@@ -215,21 +217,21 @@ export ENTRY_PATH="$1"
# verify that we have a topdir directory
#
-REPO_NAME=$(basename "$REPO_URL")
+REPO_NAME=$(basename "$REPO_TOP_URL")
export REPO_NAME
if [[ -z $TOPDIR ]]; then
echo "$0: ERROR: cannot find top of git repo directory" 1>&2
- echo "$0: Notice: if needed: $GIT_TOOL clone $REPO_URL; cd $REPO_NAME" 1>&2
+ echo "$0: Notice: if needed: $GIT_TOOL clone $REPO_TOP_URL; cd $REPO_NAME" 1>&2
exit 6
fi
if [[ ! -e $TOPDIR ]]; then
echo "$0: ERROR: TOPDIR does not exist: $TOPDIR" 1>&2
- echo "$0: Notice: if needed: $GIT_TOOL clone $REPO_URL; cd $REPO_NAME" 1>&2
+ echo "$0: Notice: if needed: $GIT_TOOL clone $REPO_TOP_URL; cd $REPO_NAME" 1>&2
exit 6
fi
if [[ ! -d $TOPDIR ]]; then
echo "$0: ERROR: TOPDIR is not a directory: $TOPDIR" 1>&2
- echo "$0: Notice: if needed: $GIT_TOOL clone $REPO_URL; cd $REPO_NAME" 1>&2
+ echo "$0: Notice: if needed: $GIT_TOOL clone $REPO_TOP_URL; cd $REPO_NAME" 1>&2
exit 6
fi
@@ -339,6 +341,7 @@ if [[ $V_FLAG -ge 3 ]]; then
echo "$0: debug[3]: V_FLAG=$V_FLAG" 1>&2
echo "$0: debug[3]: GIT_TOOL=$GIT_TOOL" 1>&2
echo "$0: debug[3]: TOPDIR=$TOPDIR" 1>&2
+ echo "$0: debug[3]: REPO_TOP_URL=$REPO_TOP_URL" 1>&2
echo "$0: debug[3]: REPO_URL=$REPO_URL" 1>&2
echo "$0: debug[3]: CAP_W_FLAG_FOUND=$CAP_W_FLAG_FOUND" 1>&2
echo "$0: debug[3]: GTAR_TOOL=$GTAR_TOOL" 1>&2
diff --git a/bin/untar-year.sh b/bin/untar-year.sh
index 9d0df0151..55ad7ead9 100755
--- a/bin/untar-year.sh
+++ b/bin/untar-year.sh
@@ -83,7 +83,7 @@ shopt -s globstar # enable ** to match all files and zero or more directories an
# set variables referenced in the usage message
#
-export VERSION="1.0.2 2024-04-14"
+export VERSION="1.0.3 2024-07-28"
NAME=$(basename "$0")
export NAME
export V_FLAG=0
@@ -99,7 +99,9 @@ if [[ $status -eq 0 ]]; then
TOPDIR=$("$GIT_TOOL" rev-parse --show-toplevel)
fi
export TOPDIR
-export REPO_URL="https://github.com/ioccc-src/temp-test-ioccc/blob/master"
+export REPO_TOP_URL="https://github.com/ioccc-src/temp-test-ioccc"
+# GitHub puts individual files under the "blob/master" sub-directory.
+export REPO_URL="$REPO_TOP_URL/blob/master"
export CAP_W_FLAG_FOUND=
GTAR_TOOL=$(type -P gtar)
export GTAR_TOOL
@@ -111,7 +113,7 @@ fi
# set usage message
#
export USAGE="usage: $0 [-h] [-v level] [-V] [-d topdir] [-D docroot/] [-n] [-N]
- [-p tool] [-u repo_url] [-w site_url] [-W]
+ [-p tool] [-u repo_top_url] [-w site_url] [-W]
YYYY
-h print help message and exit
@@ -126,7 +128,7 @@ export USAGE="usage: $0 [-h] [-v level] [-V] [-d topdir] [-D docroot/] [-n] [-N]
-p tool This option is ignored
- -u repo_url This option is ignored
+ -u repo_top_url This option is ignored
-w site_url This option is ignored
-W Warn if a file in the manifest is missing: (def: error if a file is missing)
@@ -215,21 +217,21 @@ export YYYY="$1"
# verify that we have a topdir directory
#
-REPO_NAME=$(basename "$REPO_URL")
+REPO_NAME=$(basename "$REPO_TOP_URL")
export REPO_NAME
if [[ -z $TOPDIR ]]; then
echo "$0: ERROR: cannot find top of git repo directory" 1>&2
- echo "$0: Notice: if needed: $GIT_TOOL clone $REPO_URL; cd $REPO_NAME" 1>&2
+ echo "$0: Notice: if needed: $GIT_TOOL clone $REPO_TOP_URL; cd $REPO_NAME" 1>&2
exit 6
fi
if [[ ! -e $TOPDIR ]]; then
echo "$0: ERROR: TOPDIR does not exist: $TOPDIR" 1>&2
- echo "$0: Notice: if needed: $GIT_TOOL clone $REPO_URL; cd $REPO_NAME" 1>&2
+ echo "$0: Notice: if needed: $GIT_TOOL clone $REPO_TOP_URL; cd $REPO_NAME" 1>&2
exit 6
fi
if [[ ! -d $TOPDIR ]]; then
echo "$0: ERROR: TOPDIR is not a directory: $TOPDIR" 1>&2
- echo "$0: Notice: if needed: $GIT_TOOL clone $REPO_URL; cd $REPO_NAME" 1>&2
+ echo "$0: Notice: if needed: $GIT_TOOL clone $REPO_TOP_URL; cd $REPO_NAME" 1>&2
exit 6
fi
@@ -325,6 +327,7 @@ if [[ $V_FLAG -ge 3 ]]; then
echo "$0: debug[3]: V_FLAG=$V_FLAG" 1>&2
echo "$0: debug[3]: GIT_TOOL=$GIT_TOOL" 1>&2
echo "$0: debug[3]: TOPDIR=$TOPDIR" 1>&2
+ echo "$0: debug[3]: REPO_TOP_URL=$REPO_TOP_URL" 1>&2
echo "$0: debug[3]: REPO_URL=$REPO_URL" 1>&2
echo "$0: debug[3]: CAP_W_FLAG_FOUND=$CAP_W_FLAG_FOUND" 1>&2
echo "$0: debug[3]: GTAR_TOOL=$GTAR_TOOL" 1>&2