From 601c3b1c6b96a489b52e90a9dc46acec2abb777e Mon Sep 17 00:00:00 2001 From: "reaction.la" Date: Thu, 12 May 2022 06:39:45 +1000 Subject: [PATCH] winConfigure.sh fixed, yet again README.md documentation fixed accordingly --- README.html | 34 ++++++++++++++++++---------------- README.md | 7 ++++++- winConfigure.sh | 1 + 3 files changed, 25 insertions(+), 17 deletions(-) diff --git a/README.html b/README.html index a8929ec..ed16ce8 100644 --- a/README.html +++ b/README.html @@ -97,7 +97,9 @@ this README, from the bash command line (git-bash in windows).

build the program and run unit test for the first time, launch the Visual Studio X64 native tools command prompt in the cloned directory, then:

winConfigure.bat
-

Should the libraries change in a subsequent pull --recurse-submodules you will need to run winConfigure.bat again.

+

Should the libraries change in a subsequent pull you will need

+
pull -f --recurse-submodules
+winConfigure.bat

winConfigure.bat also configures the repository you just created to use .gitconfig in the repository, causing git to to implement GPG signed commits – because cryptographic software is under attack from NSA @@ -112,21 +114,21 @@ For this to be useful you need to import the repository public key

  • git graph to graph the commit tree
  • git alias to display the git aliases.
    • -
    # To verify that the signature on future pulls is unchanged.
-gpg --import  public_key.gpg
-gpg --lsign 096EAE16FB8D62E75D243199BC4482E49673711C
-# We ignore the Gpg Web of Trust model and instead use
-# the Zooko identity model.
-# We use Gpg signatures to verify that remote repository
-# code is coming from an unchanging entity, not for
-# Gpg Web of Trust.  Web of Trust is too complicated
-# and too user hostile to be workable or safe.
-# Never --sign any Gpg key related to this project.  --lsign it.
-# Never check any Gpg key related to this project against a
-# public gpg key repository. It should not be there.
-# Never use any email address on a gpg key related to this project
-# unless it is only used for project purposes, or a fake email,
-# or the email of an enemy.
    +
    # To verify that the signature on future pulls is unchanged.
+gpg --import  public_key.gpg
+gpg --lsign 096EAE16FB8D62E75D243199BC4482E49673711C
+# We ignore the Gpg Web of Trust model and instead use
+# the Zooko identity model.
+# We use Gpg signatures to verify that remote repository
+# code is coming from an unchanging entity, not for
+# Gpg Web of Trust.  Web of Trust is too complicated
+# and too user hostile to be workable or safe.
+# Never --sign any Gpg key related to this project.  --lsign it.
+# Never check any Gpg key related to this project against a
+# public gpg key repository. It should not be there.
+# Never use any email address on a gpg key related to this project
+# unless it is only used for project purposes, or a fake email,
+# or the email of an enemy.

    To build the documentation in its intended html form from the markdown files, execute the bash script file docs/mkdocs.sh, in an environment where pandoc is available. On Windows, if Git Bash and Pandoc has been diff --git a/README.md b/README.md index 66fcbb9..a6517ca 100644 --- a/README.md +++ b/README.md @@ -25,7 +25,12 @@ Studio X64 native tools command prompt in the cloned directory, then: winConfigure.bat ``` -Should the libraries change in a subsequent `pull --recurse-submodules ` you will need to run `winConfigure.bat` again. +Should the libraries change in a subsequent `pull ` you will need + +```bat +pull -f --recurse-submodules +winConfigure.bat +``` [cryptographic software is under attack]:./docs/contributor_code_of_conduct.html#code-will-be-cryptographically-signed "Contributor Code of Conduct" diff --git a/winConfigure.sh b/winConfigure.sh index 6739878..01e1f5f 100644 --- a/winConfigure.sh +++ b/winConfigure.sh @@ -3,6 +3,7 @@ set -e set -x git submodule foreach --recursive 'git reset --hard' git submodule foreach --recursive 'git clean -xdf' +git submodule update --init --recursive git config --local include.path ../.gitconfig set +e set +x