Check-in by ben on 2024-08-13 15:21:05 Move src/config.m4 to config.m4 This emphasizes that the configuration file is separate from the source code, and makes it easier to find and edit. This also simplifies make.sh just a little bit. INSERTED DELETED 29 0 config.m4 2 2 make.sh 1 1 readme.txt 1 1 src/account/index.dcgi.m4 0 29 src/config.m4 1 1 src/details/index.dcgi.m4 1 1 src/download/index.dcgi.m4 1 1 src/list/index.dcgi.m4 1 1 src/lists/index.dcgi.m4 1 1 src/raw/index.cgi.m4 1 1 src/search/index.dcgi.m4 1 1 src/sort/index.dcgi.m4 1 1 src/wizard/step1/index.dcgi.m4 1 1 src/wizard/step2/index.dcgi.m4 1 1 src/wizard/step3/index.dcgi.m4 43 43 TOTAL over 15 changed files ADDED config.m4 Index: config.m4 ================================================================== --- /dev/null +++ config.m4 @@ -0,0 +1,29 @@ +dnl Set configuration variables +dnl +define(__PHAROS_VERSION__, 11)dnl +dnl +define(__API_ENDPOINT__, http://archive.org)dnl +define(__API_SSL_ENDPOINT__, https://archive.org)dnl +define(__AGENT__, Lynx/2.9.0dev.10 libwww-FM/2.14 SSL-MM/1.4.1 OpenSSL/1.1.1w)dnl +define(__CGIPATH__, /~user/pharos)dnl +define(__CMD_AWK__, /usr/bin/awk)dnl +define(__CMD_CURL__, /usr/bin/curl)dnl +define(__CMD_ENV__, /usr/bin/env)dnl +define(__CMD_JSON2TSV__, /usr/local/bin/json2tsv)dnl +define(__CMD_MKTEMP__, /bin/mktemp)dnl +define(__CMD_RM__, rm)dnl +define(__CMD_STRINGS__, /bin/busybox strings)dnl +define(__CMD_WEBDUMP__, /usr/local/bin/webdump)dnl +define(__CMD_XARGS__, /usr/bin/xargs)dnl +define(__GEOMYIDAE_VERSION__, 0.96)dnl +define(__MAX_BIN_SIZE__, 10)dnl +define(__MAX_TXT_SIZE__, 1)dnl +define(__SERVER__, server)dnl +define(__PORT__, port)dnl +dnl +dnl Set up M4 to work with AWK code +dnl +define(m4_substr, defn(substr))dnl +undefine(substr)dnl +changecom(`/*', `*/')dnl +define(incl,`ifdef(paste,paste($1),undivert($1))')dnl Index: make.sh ================================================================== --- make.sh +++ make.sh @@ -4,12 +4,12 @@ build() { dir=$1 in=$2 out=$3 - echo m4 -I $dir $in \>$out && chmod a+rx $out - m4 -I $dir $in >$out && chmod a+rx $out + echo "m4 $in >$out && chmod a+rx $out" + m4 $in >$out && chmod a+rx $out } # PLAIN for f in index.gph \ account/index.dcgi \ Index: readme.txt ================================================================== --- readme.txt +++ readme.txt @@ -30,11 +30,11 @@ * json2tsv * webdump Configuration ============= -To set configuration variables, edit src/config.m4 +To set configuration variables, edit config.m4 Installation ============ Installation depends on m4. Index: src/account/index.dcgi.m4 ================================================================== --- src/account/index.dcgi.m4 +++ src/account/index.dcgi.m4 @@ -3,11 +3,11 @@ # account/index.dcgi # # Show details for an account -include(config.awk) +include(src/config.awk) incl(src/api.awk) incl(src/cgi.awk) incl(src/util.awk) incl(src/web.awk) DELETED src/config.m4 Index: src/config.m4 ================================================================== --- src/config.m4 +++ /dev/null @@ -1,29 +0,0 @@ -dnl Set configuration variables -dnl -define(__PHAROS_VERSION__, 11)dnl -dnl -define(__API_ENDPOINT__, http://archive.org)dnl -define(__API_SSL_ENDPOINT__, https://archive.org)dnl -define(__AGENT__, Lynx/2.9.0dev.10 libwww-FM/2.14 SSL-MM/1.4.1 OpenSSL/1.1.1w)dnl -define(__CGIPATH__, /~user/pharos)dnl -define(__CMD_AWK__, /usr/bin/awk)dnl -define(__CMD_CURL__, /usr/bin/curl)dnl -define(__CMD_ENV__, /usr/bin/env)dnl -define(__CMD_JSON2TSV__, /usr/local/bin/json2tsv)dnl -define(__CMD_MKTEMP__, /bin/mktemp)dnl -define(__CMD_RM__, rm)dnl -define(__CMD_STRINGS__, /bin/busybox strings)dnl -define(__CMD_WEBDUMP__, /usr/local/bin/webdump)dnl -define(__CMD_XARGS__, /usr/bin/xargs)dnl -define(__GEOMYIDAE_VERSION__, 0.96)dnl -define(__MAX_BIN_SIZE__, 10)dnl -define(__MAX_TXT_SIZE__, 1)dnl -define(__SERVER__, server)dnl -define(__PORT__, port)dnl -dnl -dnl Set up M4 to work with AWK code -dnl -define(m4_substr, defn(substr))dnl -undefine(substr)dnl -changecom(`/*', `*/')dnl -define(incl,`ifdef(paste,paste($1),undivert($1))')dnl Index: src/details/index.dcgi.m4 ================================================================== --- src/details/index.dcgi.m4 +++ src/details/index.dcgi.m4 @@ -3,11 +3,11 @@ # details/index.dcgi # # Show details for an item -include(config.awk) +include(src/config.awk) incl(src/api.awk) incl(src/cgi.awk) incl(src/util.awk) incl(src/web.awk) Index: src/download/index.dcgi.m4 ================================================================== --- src/download/index.dcgi.m4 +++ src/download/index.dcgi.m4 @@ -3,11 +3,11 @@ # download/index.dcgi # # Show file downloads using either direct http or gopher proxy links -include(config.awk) +include(src/config.awk) incl(src/api.awk) incl(src/cgi.awk) incl(src/util.awk) function main(cmd, dir, files, file_size, format, iaout, is_archive, \ Index: src/list/index.dcgi.m4 ================================================================== --- src/list/index.dcgi.m4 +++ src/list/index.dcgi.m4 @@ -3,11 +3,11 @@ # list/index.dcgi # # Show a specific list -include(config.awk) +include(src/config.awk) incl(src/api.awk) incl(src/cgi.awk) incl(src/util.awk) function main( acct, cmd, count, iaout, id, is_private, item_id, Index: src/lists/index.dcgi.m4 ================================================================== --- src/lists/index.dcgi.m4 +++ src/lists/index.dcgi.m4 @@ -3,11 +3,11 @@ # lists/index.dcgi # # Show a list of a user's lists -include(config.awk) +include(src/config.awk) incl(src/api.awk) incl(src/cgi.awk) incl(src/util.awk) function main( cmd, iaout, id, is_private, item_count, item_id, \ Index: src/raw/index.cgi.m4 ================================================================== --- src/raw/index.cgi.m4 +++ src/raw/index.cgi.m4 @@ -15,11 +15,11 @@ # # text/index.cgi # # Show text content scraped from HTML document -include(config.awk) +include(src/config.awk) incl(src/api.awk) incl(src/cgi.awk) incl(src/util.awk) incl(src/web.awk) Index: src/search/index.dcgi.m4 ================================================================== --- src/search/index.dcgi.m4 +++ src/search/index.dcgi.m4 @@ -3,11 +3,11 @@ # search/index.dcgi # # Show search results -include(config.awk) +include(src/config.awk) incl(src/api.awk) incl(src/cgi.awk) incl(src/util.awk) function main(search, cmd, count, creator, descr, field, fields, i, \ Index: src/sort/index.dcgi.m4 ================================================================== --- src/sort/index.dcgi.m4 +++ src/sort/index.dcgi.m4 @@ -3,11 +3,11 @@ # sort/index.dcgi # # Change search sort order -include(config.awk) +include(src/config.awk) incl(src/cgi.awk) function main( i, lbl, opt) { lbl[1] = "Default [^]" opt[1] = "nav_order asc" Index: src/wizard/step1/index.dcgi.m4 ================================================================== --- src/wizard/step1/index.dcgi.m4 +++ src/wizard/step1/index.dcgi.m4 @@ -3,11 +3,11 @@ # wizard/step1/index.dcgi # # Select field to filter/search by -include(config.awk) +include(src/config.awk) incl(src/cgi.awk) function main( i, lbl, opt, searchstr) { searchstr = parts[4] Index: src/wizard/step2/index.dcgi.m4 ================================================================== --- src/wizard/step2/index.dcgi.m4 +++ src/wizard/step2/index.dcgi.m4 @@ -3,11 +3,11 @@ # wizard/step2/index.dcgi # # Select mediatype to filter/search by -include(config.awk) +include(src/config.awk) incl(src/cgi.awk) function main( field, newsearch, searchstr) { field = parts[4] searchstr = parts[5] Index: src/wizard/step3/index.dcgi.m4 ================================================================== --- src/wizard/step3/index.dcgi.m4 +++ src/wizard/step3/index.dcgi.m4 @@ -3,11 +3,11 @@ # wizard/step3/index.dcgi # # Apply new search terms -include(config.awk) +include(src/config.awk) incl(src/cgi.awk) function main( field, label, newsearch, op, searchstr, value) { field = parts[4] searchstr = parts[5]