diff options
Diffstat (limited to 'org')
| -rw-r--r-- | org/config_env.org | 15 | ||||
| -rw-r--r-- | org/config_git.org | 1 | ||||
| -rw-r--r-- | org/spine_info.org | 4 |
3 files changed, 18 insertions, 2 deletions
diff --git a/org/config_env.org b/org/config_env.org index 2a2dac1..84dc4eb 100644 --- a/org/config_env.org +++ b/org/config_env.org @@ -140,6 +140,19 @@ if [[ ! -d ./.git ]]; then fi #+END_SRC +** ,version (project & git version info) + +#+HEADER: :tangle ../,version +#+HEADER: :noweb yes +#+HEADER: :tangle-mode (identity #o755) +#+HEADER: :shebang #!/usr/bin/env sh +#+BEGIN_SRC shell +SpineProjVer=`rg "Version\((\d+), (\d+), (\d+)\)" views/version.txt | sed -E 's/.*([0-9]+), ([0-9]+), ([0-9]+).*/spine-v\1.\2.\3/'` && \ + SpineGitVer=`git describe | sed "s/^[a-z_-]\+\([0-9.]\+\)/\1/" | sed "s/\([^-]*-g\)/r\1/" | sed "s/-/./g"` && \ + SpineGitBranch=`git branch --show-current` && \ + echo "❯❯ $SpineProjVer - ($SpineGitBranch: $SpineGitVer)" +#+END_SRC + ** .envrc-local CHECK MODIFY - bespoke modify appropriately and generate if needed @@ -178,7 +191,7 @@ export SpineDBpath=/var/www/sqlite #export SpineDBpath=/srv/www/spine/sqlite #+END_SRC -* versions GET +* org includes - versions GET ** direnv #+NAME: direnv_version diff --git a/org/config_git.org b/org/config_git.org index fd0f037..771f7bc 100644 --- a/org/config_git.org +++ b/org/config_git.org @@ -45,6 +45,7 @@ !CHANGELOG !makefile !version.txt +!,version !configuration.txt !*.json !*.sdl diff --git a/org/spine_info.org b/org/spine_info.org index 4a2b128..7459672 100644 --- a/org/spine_info.org +++ b/org/spine_info.org @@ -624,6 +624,8 @@ for a document collection you can point to the document collection: #+NAME: sisudoc_spine_README_command_examples_search_db_cgi_text #+BEGIN_SRC text +The CGI search form is built separately in the sisudoc-spine-search-cgi/ directory. + Steps: 1. Clone the sisudoc-spine-search-cgi repository 2. Configure views/configuration.txt with your web server settings @@ -670,7 +672,7 @@ spine -v \ --output=/var/www/html \ ~spineMarkupSamples/pod/* -Note: The CGI search form is built separately in sisudoc-spine-search-cgi/ +Note: The CGI search form is built separately in the sisudoc-spine-search-cgi/ directory. #+END_SRC #+NAME: sisudoc_spine_README_command_examples_html_with_links_to_search_form_text |