Skip to content

Commit

Permalink
master: grep_and_set.sh: fix setting on non MacOS systems.
Browse files Browse the repository at this point in the history
check_all.sh: pip seems to be installing multiple site-package directories (now).
  • Loading branch information
bradbell committed Sep 8, 2024
1 parent e2676a1 commit a2af3f6
Show file tree
Hide file tree
Showing 5 changed files with 8 additions and 10 deletions.
8 changes: 3 additions & 5 deletions bin/check_install.sh
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
4 changes: 2 additions & 2 deletions bin/grep_and_sed.sh
Original file line number Diff line number Diff line change
Expand Up @@ -8,20 +8,20 @@
# 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
then
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
2 changes: 1 addition & 1 deletion pyproject.toml
Original file line number Diff line number Diff line change
Expand Up @@ -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'
Expand Down
2 changes: 1 addition & 1 deletion setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -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',
Expand Down
2 changes: 1 addition & 1 deletion xrst/run_xrst.py
Original file line number Diff line number Diff line change
Expand Up @@ -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() :
#
Expand Down

0 comments on commit a2af3f6

Please sign in to comment.