aboutsummaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
Diffstat
-rw-r--r--org/config_d_cfte.org36
-rw-r--r--org/config_env.org34
-rw-r--r--org/config_git.org4
-rw-r--r--org/config_make.org4
-rw-r--r--org/config_meson.org30
-rw-r--r--org/config_misc.org18
-rw-r--r--org/config_nix.org56
-rw-r--r--org/doc-reform.org18
-rw-r--r--org/nixpkgs_overlays_d_related.org28
-rw-r--r--org/out_latex.org2
-rw-r--r--org/out_src_pod.org6
-rw-r--r--org/spine_info.org4
12 files changed, 120 insertions, 120 deletions
diff --git a/org/config_d_cfte.org b/org/config_d_cfte.org
index e0c63a6..2797609 100644
--- a/org/config_d_cfte.org
+++ b/org/config_d_cfte.org
@@ -173,97 +173,97 @@ enum _cfg = Cfg();
**** default set
#+NAME: http_request_type
-#+BEGIN_SRC sh
+#+BEGIN_SRC shell
<<http_request_type_localhost>>
#+END_SRC
#+NAME: http_host
-#+BEGIN_SRC sh
+#+BEGIN_SRC shell
<<http_host_localhost>>
#+END_SRC
#+NAME: www_url_doc_root
-#+BEGIN_SRC sh
+#+BEGIN_SRC shell
<<www_url_doc_root_localhost>>
#+END_SRC
**** localhost
#+NAME: http_request_type_localhost
-#+BEGIN_SRC sh
+#+BEGIN_SRC shell
http
#+END_SRC
#+NAME: http_host_localhost
-#+BEGIN_SRC sh
+#+BEGIN_SRC shell
localhost
#+END_SRC
#+NAME: www_url_doc_root_localhost
-#+BEGIN_SRC sh
+#+BEGIN_SRC shell
http://localhost
#+END_SRC
**** remotehost
#+NAME: http_request_type_remotehost
-#+BEGIN_SRC sh
+#+BEGIN_SRC shell
https
#+END_SRC
#+NAME: http_host_remotehost
-#+BEGIN_SRC sh
+#+BEGIN_SRC shell
sisudoc.org
#+END_SRC
#+NAME: www_url_doc_root_remotehost
-#+BEGIN_SRC sh
+#+BEGIN_SRC shell
https://sisudoc.org
#+END_SRC
**** directory paths
#+NAME: www_url_doc_subroot
-#+BEGIN_SRC sh
+#+BEGIN_SRC shell
/spine
#+END_SRC
#+NAME: processing_path_doc_root
-#+BEGIN_SRC sh
+#+BEGIN_SRC shell
/srv/www/spine
#+END_SRC
#+NAME: www_doc_subroot
-#+BEGIN_SRC sh
+#+BEGIN_SRC shell
/spine
#+END_SRC
#+NAME: cgi_bin_root
-#+BEGIN_SRC sh
+#+BEGIN_SRC shell
/var/www/cgi/cgi-bin
#+END_SRC
#+NAME: db_sqlite_path
-#+BEGIN_SRC sh
+#+BEGIN_SRC shell
/var/www/sqlite
#+END_SRC
#+NAME: cgi_filename
-#+BEGIN_SRC sh
+#+BEGIN_SRC shell
spine_search
#+END_SRC
#+NAME: cgi_bin_subpath
-#+BEGIN_SRC sh
+#+BEGIN_SRC shell
/cgi-bin
#+END_SRC
#+NAME: cgi_search_form_title
-#+BEGIN_SRC sh
+#+BEGIN_SRC shell
≅ SiSU Spine search ፨
#+END_SRC
#+NAME: db_sqlite_filename
-#+BEGIN_SRC sh
+#+BEGIN_SRC shell
spine.search.db
#+END_SRC
diff --git a/org/config_env.org b/org/config_env.org
index 4b64cba..299aa3e 100644
--- a/org/config_env.org
+++ b/org/config_env.org
@@ -23,7 +23,7 @@
** nixDevEnv envrc :envrc:
#+HEADER: :tangle ../nixDevEnv.sh
-#+BEGIN_SRC sh
+#+BEGIN_SRC shell
if [ -f .envrc ]; then
source_env_if_exists .envrc || source .envrc
fi
@@ -33,7 +33,7 @@ fi
#+NAME: envrc
#+HEADER: :tangle ../.envrc
-#+BEGIN_SRC sh
+#+BEGIN_SRC shell
if [ -f .envrc-git-init ]; then
source_env_if_exists .envrc-git-init || source .envrc-git-init
fi
@@ -53,7 +53,7 @@ fi
- ${NixDirEnvVersion}
#+HEADER: :tangle ../.envrc-nix
-#+BEGIN_SRC sh
+#+BEGIN_SRC shell
NIX_ENFORCE_PURITY=1
# - https://github.com/nix-community/nix-direnv
NixDirEnvVersion="<<direnv-version>>"
@@ -126,59 +126,59 @@ echo "•
*** 3.0.6
#+NAME: direnv-version
-#+BEGIN_SRC sh
+#+BEGIN_SRC shell
3.0.6
#+END_SRC
#+NAME: direnv-sha
-#+BEGIN_SRC sh
+#+BEGIN_SRC shell
sha256-RYcUJaRMf8oF5LznDrlCXbkOQrywm0HDv1VjYGaJGdM=
#+END_SRC
*** 3.0.4
-#+BEGIN_SRC sh
+#+BEGIN_SRC shell
3.0.4
#+END_SRC
-#+BEGIN_SRC sh
+#+BEGIN_SRC shell
sha256-DzlYZ33mWF/Gs8DDeyjr8mnVmQGx7ASYqA5WlxwvBG4=
#+END_SRC
*** 3.0.0
-#+BEGIN_SRC sh
+#+BEGIN_SRC shell
3.0.0
#+END_SRC
-#+BEGIN_SRC sh
+#+BEGIN_SRC shell
sha256-21TMnI2xWX7HkSTjFFri2UaohXVj854mgvWapWrxRXg=
#+END_SRC
*** 2.4.0
-#+BEGIN_SRC sh
+#+BEGIN_SRC shell
2.4.0
#+END_SRC
-#+BEGIN_SRC sh
+#+BEGIN_SRC shell
sha256-XQzUAvL6pysIJnRJyR7uVpmUSZfc7LSgWQwq/4mBr1U=
#+END_SRC
-#+BEGIN_SRC sh
+#+BEGIN_SRC shell
2.3.0
#+END_SRC
-#+BEGIN_SRC sh
+#+BEGIN_SRC shell
sha256-Dmd+j63L84wuzgyjITIfSxSD57Tx7v51DMxVZOsiUD8=
#+END_SRC
#+NAME: direnv-sha_
-#+BEGIN_SRC sh
+#+BEGIN_SRC shell
sha256-0000000000000000000000000000000000000000000=
#+END_SRC
-#+BEGIN_SRC sh
+#+BEGIN_SRC shell
- https://github.com/nix-community/nix-direnv
NixDirEnvSHA="sha256-0000000000000000000000000000000000000000000="
direnv fetchurl https://raw.githubusercontent.com/nix-community/nix-direnv/${NixDirEnvVersion}/direnvrc
@@ -188,7 +188,7 @@ direnv fetchurl https://raw.githubusercontent.com/nix-community/nix-direnv/${Nix
#+HEADER: :tangle ../.envrc-git-init
#+HEADER: :noweb yes
-#+BEGIN_SRC sh
+#+BEGIN_SRC shell
if [[ ! -d ./.git ]]; then
git init
git add .
@@ -201,7 +201,7 @@ fi
#+HEADER: :tangle ../.envrc-local_
#+HEADER: :noweb yes
-#+BEGIN_SRC sh
+#+BEGIN_SRC shell
export SpineVER=$(git describe --long --tags | sed 's/^[ a-z_-]\+\([0-9.]\+\)/\1/;s/\([^-]*-g\)/r\1/;s/-/./g')
export SpineBIN=./result/bin/spine
# ❯❯ nix builds spine binary:
diff --git a/org/config_git.org b/org/config_git.org
index 73aa26b..2f4d024 100644
--- a/org/config_git.org
+++ b/org/config_git.org
@@ -21,7 +21,7 @@
** .gitignore :gitignore:
#+HEADER: :tangle "../.gitignore"
-#+BEGIN_SRC sh
+#+BEGIN_SRC gitignore
# git ls-files --others --exclude-from=.git/info/exclude
# git check-ignore -v flake.lock
# git clean -ix
@@ -115,7 +115,7 @@ tmp/**
** .gitattributes :gitattributes:
#+HEADER: :tangle "../.gitattributes"
-#+BEGIN_SRC sh
+#+BEGIN_SRC gitattributes
/org export-ignore
/subprojects export-ignore
/build export-ignore
diff --git a/org/config_make.org b/org/config_make.org
index 63cd976..286842b 100644
--- a/org/config_make.org
+++ b/org/config_make.org
@@ -31,14 +31,14 @@
- meson
#+NAME: meson_version_set
-#+BEGIN_SRC sh
+#+BEGIN_SRC shell
0.46
#+END_SRC
- soversion
#+NAME: soversion_version_set
-#+BEGIN_SRC sh
+#+BEGIN_SRC shell
0
#+END_SRC
diff --git a/org/config_meson.org b/org/config_meson.org
index da30291..60690cc 100644
--- a/org/config_meson.org
+++ b/org/config_meson.org
@@ -33,7 +33,7 @@
https://code.dlang.org/packages/d2sqlite3
#+NAME: d2sqlite3_version_set
-#+BEGIN_SRC sh
+#+BEGIN_SRC shell
0.19.1
#+END_SRC
@@ -41,7 +41,7 @@
https://code.dlang.org/packages/imageformats
#+NAME: imageformats_version_set
-#+BEGIN_SRC sh
+#+BEGIN_SRC shell
7.0.2
#+END_SRC
@@ -49,7 +49,7 @@
https://code.dlang.org/packages/dyaml
#+NAME: dyaml_version_set
-#+BEGIN_SRC sh
+#+BEGIN_SRC shell
0.8.3
#+END_SRC
@@ -57,7 +57,7 @@
https://code.dlang.org/packages/tinyendian
#+NAME: tinyendian_version_set
-#+BEGIN_SRC sh
+#+BEGIN_SRC shell
0.2.0
#+END_SRC
@@ -66,14 +66,14 @@
- meson
#+NAME: meson_version_set
-#+BEGIN_SRC sh
+#+BEGIN_SRC shell
0.46
#+END_SRC
- soversion
#+NAME: soversion_version_set
-#+BEGIN_SRC sh
+#+BEGIN_SRC shell
0
#+END_SRC
@@ -115,7 +115,7 @@ cat spine_sources.txt
#+HEADER: :tangle ../meson.build
#+HEADER: :noweb yes
-#+BEGIN_SRC sh
+#+BEGIN_SRC shell
project('spine', 'd',
license: 'AGPL-3',
version: '<<spine_version>>',
@@ -220,7 +220,7 @@ spine_exe = executable('spine',
***** wrap
#+HEADER: :tangle ../subprojects/d2sqlite3.wrap
-#+BEGIN_SRC sh
+#+BEGIN_SRC shell
[wrap-git]
directory = d2sqlite3
url = https://github.com/dlang-community/d2sqlite3.git
@@ -231,7 +231,7 @@ revision = head
#+HEADER: :NO-tangle ../subprojects/d2sqlite3.meson.build
#+HEADER: :noweb yes
-#+BEGIN_SRC sh
+#+BEGIN_SRC shell
project('d2sqlite3', 'd',
meson_version: '>=<<meson_version_set>>',
license: 'BSL-1.0',
@@ -286,7 +286,7 @@ d2sqlite3_dep = declare_dependency(
***** wrap
#+HEADER: :tangle ../subprojects/dyaml.wrap
-#+BEGIN_SRC sh
+#+BEGIN_SRC shell
[wrap-git]
directory = dyaml
url = https://github.com/dlang-community/D-YAML.git
@@ -299,7 +299,7 @@ Upstream provides meson.build
#+HEADER: :NO-tangle ../subprojects/D-YAML/meson.build
#+HEADER: :noweb yes
-#+BEGIN_SRC sh
+#+BEGIN_SRC shell
project('D-YAML', 'd',
meson_version: '>=<<meson_version_set>>',
subproject_dir: 'contrib',
@@ -376,7 +376,7 @@ dyaml_dep = declare_dependency(
***** wrap
#+HEADER: :tangle ../subprojects/imageformats.wrap
-#+BEGIN_SRC sh
+#+BEGIN_SRC shell
[wrap-git]
directory = imageformats
url = https://github.com/lgvz/imageformats.git
@@ -387,7 +387,7 @@ revision = head
#+HEADER: :NO-tangle ../subprojects/imageformats.meson.build
#+HEADER: :noweb yes
-#+BEGIN_SRC sh
+#+BEGIN_SRC shell
project('imageformats', 'd',
meson_version: '>=<<meson_version_set>>',
license: 'BSL-1.0',
@@ -434,7 +434,7 @@ imageformats_dep = declare_dependency(
***** wrap
#+HEADER: :tangle ../subprojects/tinyendian.wrap
-#+BEGIN_SRC sh
+#+BEGIN_SRC shell
[wrap-git]
directory = tinyendian
url = https://github.com/dlang-community/tinyendian.git
@@ -447,7 +447,7 @@ Upstream provides meson.build
#+HEADER: :NO-tangle ../subprojects/tinyendian/meson.build
#+HEADER: :noweb yes
-#+BEGIN_SRC sh
+#+BEGIN_SRC shell
# -*- mode: python; -*-
project(
diff --git a/org/config_misc.org b/org/config_misc.org
index e099ad1..cf79a58 100644
--- a/org/config_misc.org
+++ b/org/config_misc.org
@@ -26,7 +26,7 @@ babel tangle) org files in ./org/ to create .d source files in ./src/sisudoc/
#+HEADER: :tangle ../tangle
#+HEADER: :tangle-mode (identity #o755)
#+HEADER: :shebang "#!/bin/sh"
-#+BEGIN_SRC sh
+#+BEGIN_SRC shell
# -*- mode: shell-script -*-
# tangle files with org-mode
DIR=`pwd`
@@ -56,11 +56,11 @@ emacs --batch -Q -q \
** build
*** dub
-#+BEGIN_SRC sh
+#+BEGIN_SRC shell
dub build -h
#+END_SRC
-#+BEGIN_SRC sh
+#+BEGIN_SRC shell
time dub --compiler=ldc2 -v --force
time (dub --compiler=ldc2 --config=spine-ldc --debug=steps)
time (dub --compiler=ldc2 --config=spine-ldc --debug=checkdoc --debug=summary --debug=dumpdoc)
@@ -79,7 +79,7 @@ time (dub --compiler=gdc --config=spine-gdc-debug --debug=io)
*** make
-#+BEGIN_SRC sh
+#+BEGIN_SRC shell
time make dmd
time make gdc
time make ldc
@@ -98,13 +98,13 @@ time make ldc_testrun_find_pod_epub
** git
*** project version
-#+BEGIN_SRC sh
+#+BEGIN_SRC shell
echo $(git describe --long --tags | sed 's/^[ a-z_-]\+\([0-9.]\+\)/\1/;s/\([^-]*-g\)/r\1/;s/-/./g')
#+END_SRC
*** what files changed
-#+BEGIN_SRC sh
+#+BEGIN_SRC shell
git whatchanged --since="1 day ago" --oneline --name-only --pretty=format: | sort -u
git log --since="1 day ago" --name-only --pretty=format: | sort -u
#+END_SRC
@@ -112,7 +112,7 @@ git log --since="1 day ago" --name-only --pretty=format: | sort -u
** test run
*** e.g.
-#+BEGIN_SRC sh
+#+BEGIN_SRC shell
time (./result/bin/spine --source --html -v --output-dir=tmp/program-output data/pod/sisu-manual/media/text/en/sisu_markup.sst )
time (./bin/spine-ldc --source --html -v --output-dir=tmp/program-output data/pod/sisu-manual/media/text/en/sisu_markup.sst )
@@ -144,7 +144,7 @@ find data/sisudir/media/text -name *.ss[tm] | sort | xargs
*** sort
-#+BEGIN_SRC sh
+#+BEGIN_SRC shell
~dr/bin/spine-ldc -v --sqlite-db-create --sqlite-db-filename="spine.search.db" --cgi-sqlite-search-filename="spine-search" --output=/var/www/html \
~grotto/repo/git.repo/code/project-spine/doc-reform-markup/markup_samples/markup/pod/*
@@ -170,7 +170,7 @@ find data/sisudir/media/text -name *.ss[tm] | sort | xargs
- search script in D @: /var/www/html/cgi/src/spine_search.d
- html output * /var/www/html/en/html/[filename]
-#+BEGIN_SRC sh
+#+BEGIN_SRC shell
cd /var/www/html/cgi
cp arsd/cgi.d /var/www/html/cgi/. *-[needs to be implemented as part of code]
diff --git a/org/config_nix.org b/org/config_nix.org
index 351562a..a255712 100644
--- a/org/config_nix.org
+++ b/org/config_nix.org
@@ -662,14 +662,14 @@ installPhase = ''
**** github (official)
#+NAME: nixpkgs_url_github
-#+BEGIN_SRC sh
+#+BEGIN_SRC shell
github:NixOS/nixpkgs/nixpkgs-unstable
#+END_SRC
**** localhost
#+NAME: nixpkgs_url_local
-#+BEGIN_SRC sh
+#+BEGIN_SRC shell
/srv/nix/nixpkgs
#+END_SRC
@@ -738,7 +738,7 @@ nix-shell '<nixpkgs>' -A nix --pure
*** echo-nixNote
#+HEADER: :tangle ../.env/echo-nixNote
-#+BEGIN_SRC sh
+#+BEGIN_SRC shell
echo '-*- mode: org -*-
,* nixpkgs path?
@@ -751,7 +751,7 @@ echo " <nixpkgs> == `nix-instantiate --find-file nixpkgs`" >> nixNote_.org
echo '
,* nix build and show derivation
-,#+BEGIN_SRC sh
+,#+BEGIN_SRC shell
nix-shell --pure
nix-build
@@ -789,7 +789,7 @@ echo "#+END_SRC
,* initialised shell variables
-,#+BEGIN_SRC sh
+,#+BEGIN_SRC shell
SpineSRC=$SpineSRC
SpineDOC=$SpineDOC
SpinePOD=$SpinePOD
@@ -802,81 +802,81 @@ echo '* spine run instruction examples
,** parallelized tasks
,*** doc source
-,#+BEGIN_SRC sh
+,#+BEGIN_SRC shell
$SpineBIN/spine --very-verbose --pod --source --output="$SpineOUTversioned" $SpinePOD/*
,#+END_SRC
,*** html & epub output
-,#+BEGIN_SRC sh
+,#+BEGIN_SRC shell
$SpineBIN/spine --very-verbose --html --epub --output="$SpineOUTversioned" $SpinePOD/*
,#+END_SRC
,*** sqlite db for each document - populate each db
-,#+BEGIN_SRC sh
+,#+BEGIN_SRC shell
$SpineBIN/spine --very-verbose --sqlite-discrete --output="$SpineOUTversioned" $SpinePOD/*
,#+END_SRC
,*** doc source; html, epub; sqlite outputs
-,#+BEGIN_SRC sh
+,#+BEGIN_SRC shell
$SpineBIN/spine --verbose --pod --html --epub --sqlite-discrete --output="$SpineOUTversioned" $SpinePOD/*
,#+END_SRC
,*** curate (authors topics)
-,#+BEGIN_SRC sh
+,#+BEGIN_SRC shell
$SpineBIN/spine --very-verbose --curate --output="$SpineOUTversioned" $SpinePOD/*
,#+END_SRC
,*** html, curate
-,#+BEGIN_SRC sh
+,#+BEGIN_SRC shell
$SpineBIN/spine --verbose --dark --html --html-link-curate --curate --output="$SpineOUTversioned" $SpinePOD/*
$SpineBIN/spine --very-verbose --html --html-link-curate --curate --output="$SpineOUTversioned" $SpinePOD/*
,#+END_SRC
,*** composite command: source pod, html, epub, curate, sqlite
-,#+BEGIN_SRC sh
+,#+BEGIN_SRC shell
$SpineBIN/spine --verbose --dark --pod --epub --html --html-link-curate --curate --sqlite-discrete --output="$SpineOUTversioned" $SpinePOD/*
,#+END_SRC
,** sequential tasks
,*** sqlite db (shared) - create db
-,#+BEGIN_SRC sh
+,#+BEGIN_SRC shell
$SpineBIN/spine --very-verbose --sqlite-db-create --output="$SpineOUTversioned"
,#+END_SRC
,*** sqlite db (shared) - populate db
-,#+BEGIN_SRC sh
+,#+BEGIN_SRC shell
$SpineBIN/spine --very-verbose --sqlite-update --output="$SpineOUTversioned" $SpineDOC/sisudoc-spine-markup-samples/markup/pod/*
,#+END_SRC
,*** sqlite db (shared) - drop db
-,#+BEGIN_SRC sh
+,#+BEGIN_SRC shell
$SpineBIN/spine --very-verbose --sqlite-db-drop --output="$SpineOUTversioned"
,#+END_SRC
,*** sqlite db (shared) - create & populate db (single step)
-,#+BEGIN_SRC sh
+,#+BEGIN_SRC shell
$SpineBIN/spine --very-verbose --sqlite-db-create --sqlite-update --output="$SpineOUTversioned" $SpinePOD/*
,#+END_SRC
,*** composite command: source pod, html, epub, curate, sqlite
-,#+BEGIN_SRC sh
+,#+BEGIN_SRC shell
$SpineBIN/spine --verbose --no-parallel --dark --pod --epub --html --html-link-curate --curate --sqlite-discrete --output="$SpineOUTversioned" $SpinePOD/*
,#+END_SRC
,** config [./pod/].dr/config_local_site
-,#+BEGIN_SRC sh
+,#+BEGIN_SRC shell
cat $SpinePOD/.dr/config_local_site
$SpineBIN/spine --show-config $SpinePOD
$SpineBIN/spine --show-config --output="$SpineOUTversioned" $SpinePOD
@@ -884,7 +884,7 @@ $SpineBIN/spine --show-config --output="$SpineOUTversioned" $SpinePOD
,** cgi operations (output to $SpineOUT /var/www)
-,#+BEGIN_SRC sh
+,#+BEGIN_SRC shell
$SpineBIN/spine --very-verbose --sqlite-db-create --output="$SpineOUT" $SpinePOD/*
$SpineBIN/spine -v --cgi-search-form-codegen --output=$SpineOUT $SpinePOD/*
@@ -899,26 +899,26 @@ $SpineBIN/spine -v --cgi-search-form-codegen --config=$SpinePOD/.dr/config_local
,*** generate html linked to search form
-,#+BEGIN_SRC sh
+,#+BEGIN_SRC shell
$SpineBIN/spine -v --html --html-link-search --html-link-curate --curate --output=$SpineOUT $SpinePOD/*
,#+END_SRC
,*** create or re-create sql db (--sqlite-db-create or --sqlite-db-recreate)
-,#+BEGIN_SRC sh
+,#+BEGIN_SRC shell
$SpineBIN/spine -v --sqlite-db-create --sqlite-db-filename="<<spine_search_db>>" --sqlite-db-path="$SpineDBpath"
$SpineBIN/spine -v --sqlite-db-recreate --sqlite-db-filename="<<spine_search_db>>" --sqlite-db-path="$SpineDBpath"
,#+END_SRC
,*** populate sqlite db
-,#+BEGIN_SRC sh
+,#+BEGIN_SRC shell
$SpineBIN/spine -v --sqlite-update --sqlite-db-filename="<<spine_search_db>>" --output=$SpineOUT $SpinePOD/*
,#+END_SRC
,*** generate html (linked to search form), sql output, curate COMPOSITE
-,#+BEGIN_SRC sh
+,#+BEGIN_SRC shell
$SpineBIN/spine -v --html --html-link-search --html-link-curate --curate --sqlite-update --sqlite-db-filename="<<spine_search_db>>" --cgi-sqlite-search-filename="<<spine_search_cgi>>" --sqlite-db-path="$SpineDBpath" --output="$SpineOUT" $SpinePOD/*
$SpineBIN/spine --epub --html --html-link-search --html-link-curate --curate --sqlite-update --sqlite-db-filename="spine.search.db" --cgi-sqlite-search-filename="spine_search" --cgi-url-action="https://sisudoc.org/spine_search" --ouput="$SpineOUT" $SpinePOD/*
,#+END_SRC
@@ -927,7 +927,7 @@ $SpineBIN/spine --epub --html --html-link-search --html-link-curate --curate --s
if names and paths are configured in resource configuration file, e.g. $SpinePOD/.rc/config_local_site
-,#+BEGIN_SRC sh
+,#+BEGIN_SRC shell
$SpineBIN/spine -v --html --html-link-search --html-link-curate --curate --sqlite-update $SpinePOD/*
,#+END_SRC
@@ -962,13 +962,13 @@ webserv:
,*** make search form
-,#+BEGIN_SRC sh
+,#+BEGIN_SRC shell
$SpineBIN/spine -v --cgi-search-form-codegen --config=$SpinePOD/.dr/config_local_site
,#+END_SRC
,*** latex
-,#+BEGIN_SRC sh
+,#+BEGIN_SRC shell
$SpineBIN/spine --latex --serial --output="$SpineOUT" $SpinePOD/*
ls $SpineOutstatic/latex/*.tex
,#+END_SRC
@@ -983,12 +983,12 @@ ls $SpineOutstatic/latex/*.tex
*** db search related variables
#+NAME: spine_search_db
-#+BEGIN_SRC sh
+#+BEGIN_SRC shell
spine.search.db
#+END_SRC
#+NAME: spine_search_cgi
-#+BEGIN_SRC sh
+#+BEGIN_SRC shell
spine_search
#+END_SRC
diff --git a/org/doc-reform.org b/org/doc-reform.org
index 367bfcf..ee39909 100644
--- a/org/doc-reform.org
+++ b/org/doc-reform.org
@@ -25,7 +25,7 @@
#+NAME: listdir
#+HEADER: :results output replace
#+HEADER: :wrap src text
-#+BEGIN_SRC sh
+#+BEGIN_SRC shell
ls -1 *\.org
#+END_SRC
@@ -78,7 +78,7 @@ util_spine_syntax_highlighting_vim.org
#+NAME: listdir_spine
#+HEADER: :results output replace
#+HEADER: :wrap src text
-#+BEGIN_SRC sh
+#+BEGIN_SRC shell
ls -1 spine\.org
#+END_SRC
@@ -98,7 +98,7 @@ misc and shared look at
#+NAME: listdir_default
#+HEADER: :results output replace
#+HEADER: :wrap src text
-#+BEGIN_SRC sh
+#+BEGIN_SRC shell
ls -1 default_*\.org
#+END_SRC
@@ -118,7 +118,7 @@ default_shared.org
#+NAME: listdir_in
#+HEADER: :results output replace
#+HEADER: :wrap src text
-#+BEGIN_SRC sh
+#+BEGIN_SRC shell
ls -1 in_*\.org
#+END_SRC
@@ -134,7 +134,7 @@ in_source_files.org
#+NAME: listdir_meta
#+HEADER: :results output replace
#+HEADER: :wrap src text
-#+BEGIN_SRC sh
+#+BEGIN_SRC shell
ls -1 ocda\.org meta_*\.org
#+END_SRC
@@ -150,7 +150,7 @@ ocda.org
#+NAME: listdir_out
#+HEADER: :results output replace
#+HEADER: :wrap src text
-#+BEGIN_SRC sh
+#+BEGIN_SRC shell
ls -1 output_*\.org out_*\.org
#+END_SRC
@@ -175,7 +175,7 @@ out_zip.org
#+NAME: listdir_spine_misc
#+HEADER: :results output replace
#+HEADER: :wrap src text
-#+BEGIN_SRC sh
+#+BEGIN_SRC shell
ls -1 spine_*\.org
#+END_SRC
@@ -192,7 +192,7 @@ spine_markup_sample.org
#+NAME: listdir_config
#+HEADER: :results output replace
#+HEADER: :wrap src text
-#+BEGIN_SRC sh
+#+BEGIN_SRC shell
ls -1 config_*\.org
#+END_SRC
@@ -212,7 +212,7 @@ config_nix.org
#+NAME: listdir_util
#+HEADER: :results output replace
#+HEADER: :wrap src text
-#+BEGIN_SRC sh
+#+BEGIN_SRC shell
ls -1 util_*\.org
#+END_SRC
diff --git a/org/nixpkgs_overlays_d_related.org b/org/nixpkgs_overlays_d_related.org
index e0f7627..b351e67 100644
--- a/org/nixpkgs_overlays_d_related.org
+++ b/org/nixpkgs_overlays_d_related.org
@@ -191,7 +191,7 @@ nix flake update && nix flake check --show-trace && nix flake info && echo "" &&
** .gitignore
#+HEADER: :tangle-NO "../nix-overlays/.gitignore"
-#+BEGIN_SRC sh
+#+BEGIN_SRC gitignore
# git ls-files --others --exclude-from=.git/info/exclude
# git check-ignore -v flake.lock
# git clean -ix
@@ -234,7 +234,7 @@ tmp/**
*** nixDevEnv.sh (.envrc)
#+HEADER: :tangle-NO "../nix-overlays/nixDevEnv.sh"
-#+BEGIN_SRC sh
+#+BEGIN_SRC shell
if [ -f .envrc-local ]; then
source_env_if_exists .envrc-local || source .envrc-local
fi
@@ -246,7 +246,7 @@ fi
*** .envrc-local
#+HEADER: :tangle-NO "../nix-overlays/.envrc-local"
-#+BEGIN_SRC sh
+#+BEGIN_SRC shell
#if [[ !( -f ./nix-flakes.org) && -f ../dlang-nix-flakes.org ]]; then
# # for editing purpose link to the .org file that creates ./dlang-nix-flakes/ content
# ln -s ../dlang-nix-flakes.org ./nix-flakes.org
@@ -267,7 +267,7 @@ fi
- ${NixDirEnvVersion}
#+HEADER: :tangle-NO "../nix-overlays/.envrc-nix"
-#+BEGIN_SRC sh
+#+BEGIN_SRC shell
NIX_ENFORCE_PURITY=1
# - https://github.com/nix-community/nix-direnv
NixDirEnvVersion="<<direnv-version>>"
@@ -294,51 +294,51 @@ use flake .
*** 3.0.6
#+NAME: direnv-version
-#+BEGIN_SRC sh
+#+BEGIN_SRC shell
3.0.6
#+END_SRC
#+NAME: direnv-sha
-#+BEGIN_SRC sh
+#+BEGIN_SRC shell
sha256-RYcUJaRMf8oF5LznDrlCXbkOQrywm0HDv1VjYGaJGdM=
#+END_SRC
*** 3.0.4
-#+BEGIN_SRC sh
+#+BEGIN_SRC shell
3.0.4
#+END_SRC
-#+BEGIN_SRC sh
+#+BEGIN_SRC shell
sha256-DzlYZ33mWF/Gs8DDeyjr8mnVmQGx7ASYqA5WlxwvBG4=
#+END_SRC
*** 3.0.0
-#+BEGIN_SRC sh
+#+BEGIN_SRC shell
3.0.0
#+END_SRC
-#+BEGIN_SRC sh
+#+BEGIN_SRC shell
sha256-21TMnI2xWX7HkSTjFFri2UaohXVj854mgvWapWrxRXg=
#+END_SRC
*** 2.4.0
-#+BEGIN_SRC sh
+#+BEGIN_SRC shell
2.4.0
#+END_SRC
-#+BEGIN_SRC sh
+#+BEGIN_SRC shell
sha256-XQzUAvL6pysIJnRJyR7uVpmUSZfc7LSgWQwq/4mBr1U=
#+END_SRC
#+NAME: direnv-sha_
-#+BEGIN_SRC sh
+#+BEGIN_SRC shell
sha256-0000000000000000000000000000000000000000000=
#+END_SRC
-#+BEGIN_SRC sh
+#+BEGIN_SRC shell
- https://github.com/nix-community/nix-direnv
NixDirEnvSHA="sha256-0000000000000000000000000000000000000000000="
direnv fetchurl https://raw.githubusercontent.com/nix-community/nix-direnv/${NixDirEnvVersion}/direnvrc
diff --git a/org/out_latex.org b/org/out_latex.org
index e7422e8..9767286 100644
--- a/org/out_latex.org
+++ b/org/out_latex.org
@@ -2050,7 +2050,7 @@ if (paper_set.is_portrait) {
***** (a4, a5, b4, letter, legal) * (portrait & landscape)
-#+BEGIN_SRC sh
+#+BEGIN_SRC shell
$SpineBIN/spine --verbose --latex --set-papersize="a4,letter.portrait,b4.portrait" --output="$SpineOUT" $SpinePOD/*
#+END_SRC
diff --git a/org/out_src_pod.org b/org/out_src_pod.org
index affd142..e72d332 100644
--- a/org/out_src_pod.org
+++ b/org/out_src_pod.org
@@ -533,7 +533,7 @@ void zipArchiveDigest(M,F,D)(M doc_matters, F fn_pod, D _digests) {
*** pod/{pods/}
#+NAME: pod_gitignore
-#+BEGIN_SRC sh
+#+BEGIN_SRC shell
# git ls-files --others --exclude-from=.git/info/exclude
,*
!.gitignore
@@ -611,7 +611,7 @@ tmp/**
*** document pod structure
#+NAME: pod_gitignore
-#+BEGIN_SRC sh
+#+BEGIN_SRC shell
# git ls-files --others --exclude-from=.git/info/exclude
,*
!.gitignore
@@ -641,7 +641,7 @@ tmp/**
*** pod po4a structure
#+NAME: pod_gitignore
-#+BEGIN_SRC sh
+#+BEGIN_SRC shell
# git ls-files --others --exclude-from=.git/info/exclude
,*
!.gitignore
diff --git a/org/spine_info.org b/org/spine_info.org
index b0d64ed..a2078fe 100644
--- a/org/spine_info.org
+++ b/org/spine_info.org
@@ -1155,14 +1155,14 @@ webserv:
* CHANGELOG :changelog:
-#+BEGIN_SRC sh
+#+BEGIN_SRC shell
CHL="CHANGELOG"
git log --pretty=format:'-_-%+s %+as %ae%+h%d%+b' --no-merges \
| sed "/^\\s*$/d" | sed "s/^\([ ]\)*\*/\1-/" | sed "s/ \+$//" | sed "s/^-_-$//" \
> ${CHL}
#+END_SRC
-#+BEGIN_SRC sh
+#+BEGIN_SRC shell
git log --pretty=format:"-_-_%+s %+as %ae%+h%d%+b" --no-merges \
> ${CHL} && sed -i '/^$/d; s/^\([ ]\)*\*/\1-/; s/ \+$//; s/^-_-_//' ${CHL}
#+END_SRC
generated by cgit v1.2.3 (git 2.25.1) at 2025-01-08 15:21:53 +0000