diff --git a/bin/check_install.sh b/bin/check_install.sh index 3e39539..a99c517 100755 --- a/bin/check_install.sh +++ b/bin/check_install.sh @@ -27,14 +27,12 @@ fi pip install --prefix=$prefix . # # PYTHONPATH -count=$(find $prefix -name 'site-packages' | wc -l) -if [ "$count" -ne 1 ] +site_packages="$(find $prefix -name 'site-packages' | head -1)" +if [ "$site_packages" == '' ] then - echo "check_install.sh: $count site-packages below $prefix" - find $prefix -name 'site-packages' + echo "bin/check_install.sh: cannot find site-packages below $prefix" exit 1 fi -site_packages="$(find $prefix -name 'site-packages')" if [ -z "${PYTHONPATH+x}" ] then PYTHONPATH="$site_packages" diff --git a/bin/grep_and_sed.sh b/bin/grep_and_sed.sh index cb51066..699cdf2 100644 --- a/bin/grep_and_sed.sh +++ b/bin/grep_and_sed.sh @@ -8,6 +8,8 @@ # Sets the shell variables grep and sed to the gnu version for this system # # sed, grep +sed=sed +grep=grep if [ "$(uname)" == 'Darwin' ] then if which gsed > /dev/null @@ -15,13 +17,11 @@ if which gsed > /dev/null sed=gsed else echo 'darwin_names.sh: cannot find gsed (gnu sed) on MacOS system' - sed=sed fi if which ggrep > /dev/null then grep=ggrep else echo 'darwin_names.sh: cannot find ggrep (gnu grep) on MacOS system' - grep=grep fi fi diff --git a/pyproject.toml b/pyproject.toml index 75547b0..6989b06 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -11,7 +11,7 @@ build-backend = 'setuptools.build_meta' # ----------------------------------------------------------------------------- [project] name = 'xrst' -version = '2024.9.4' +version = '2024.9.7' description = 'Extract RST files from source code and run Sphinx' readme = 'readme.md' requires-python = '>=3.0' diff --git a/setup.py b/setup.py index 054cdcb..4fb631a 100644 --- a/setup.py +++ b/setup.py @@ -8,7 +8,7 @@ setup( name = 'xrst', - version = '2024.9.4', + version = '2024.9.7', description = 'Extract RST files from source code and run Sphinx', license = 'GPL-3.0-or-later', keywords = 'sphinx rst documentation source', diff --git a/xrst/run_xrst.py b/xrst/run_xrst.py index a3f29cd..c15cfaf 100644 --- a/xrst/run_xrst.py +++ b/xrst/run_xrst.py @@ -608,7 +608,7 @@ def fix_latex(latex_dir, project_name) : import xrst # # version -version = '2024.9.4' +version = '2024.9.7' # def run_xrst() : #