Fix(mk-project): `sed` requires `s` for substitute

diff --git a/mk-project b/mk-project
index eecfa53d03c23d52845f9a5fb7d49215c013ba7b..788ddbec1779257f68c8ec1fed7ac61385fe359e 100755 (executable)
--- a/mk-project
+++ b/mk-project
@@ -14,7 +14,7 @@ cp -ap project_template "$HOME/tmp/$project_name" &&
 cd "$HOME/tmp/$project_name" &&
 mv project "$project_name" &&
 
 cd "$HOME/tmp/$project_name" &&
 mv project "$project_name" &&
 

-sed -i /'{project}'/"$project_name"/g .gitignore README.rst \
+sed -i s/'{project}'/"$project_name"/g .gitignore README.rst \

    devscripts/README.html  docs/genapidocs docs/install.rst \
    mk-distr publish-docs setup.py tox.ini &&
 
    devscripts/README.html  docs/genapidocs docs/install.rst \
    mk-distr publish-docs setup.py tox.ini &&
 

diff --git a/project_template/.github/workflows/test-publish.yaml b/project_template/.github/workflows/test-publish.yaml
index b4c337a45913dba3d336897beb589234ad26355f..5c4ae126d6be9999d4e171b960a03acd5ea37947 100644 (file)
--- a/project_template/.github/workflows/test-publish.yaml
+++ b/project_template/.github/workflows/test-publish.yaml
@@ -55,14 +55,21 @@ jobs:
       - name: Set TOXENV
         run: |
           import os, sys
       - name: Set TOXENV
         run: |
           import os, sys

+          ld_library_path = None

           if hasattr(sys, 'pypy_version_info'):
             toxenv = 'pypy3'
           else:
             pyver = '%d%d' % tuple(sys.version_info[:2])
           if hasattr(sys, 'pypy_version_info'):
             toxenv = 'pypy3'
           else:
             pyver = '%d%d' % tuple(sys.version_info[:2])

+            if os.name == 'posix':
+              if pyver == '27':  # Python 2.7 on Linux requires `$LD_LIBRARY_PATH`
+                ld_library_path = os.path.join(
+                  os.path.dirname(os.path.dirname(sys.executable)), 'lib')

             toxenv = 'py%s' % pyver
             if os.name == 'posix':
               toxenv += ',py%s-flake8' % pyver
           with open(os.environ['GITHUB_ENV'], 'a') as f:
             toxenv = 'py%s' % pyver
             if os.name == 'posix':
               toxenv += ',py%s-flake8' % pyver
           with open(os.environ['GITHUB_ENV'], 'a') as f:

+            if ld_library_path:
+              f.write('LD_LIBRARY_PATH=' + ld_library_path + '\n')

             f.write('TOXENV=' + toxenv + '\n')
           print(toxenv)
         shell: python
             f.write('TOXENV=' + toxenv + '\n')
           print(toxenv)
         shell: python

diff --git a/publish2web b/publish2web
index 1b7a6f9c3b00c79ec27e7cde93573772f49eac31..b0898f1fece84e3871872e0376a4f5d9cd1b5658 100755 (executable)
--- a/publish2web
+++ b/publish2web
@@ -24,7 +24,7 @@ cd "$dest_dir" &&
 git gc --aggressive &&
 git repack -a -d -f --depth=20 --window=250 &&
 git fsck --strict &&
 git gc --aggressive &&
 git repack -a -d -f --depth=20 --window=250 &&
 git fsck --strict &&

-git config receive.updateserverinfo true && git update-server-info &&
+git config receive.updateServerInfo true && git update-server-info &&

 cp -p "$HOME"/Internet/WWW/htdocs/git.phdru.name/phdru.name/phdru.name.git/git-daemon-export-ok . &&
 if [ "`cat \"$source_dir\"/.git/description`" = \
    "Unnamed repository; edit this file 'description' to name the repository." ]
 cp -p "$HOME"/Internet/WWW/htdocs/git.phdru.name/phdru.name/phdru.name.git/git-daemon-export-ok . &&
 if [ "`cat \"$source_dir\"/.git/description`" = \
    "Unnamed repository; edit this file 'description' to name the repository." ]