Rename redo/python -> redo/py.

This avoids a name overlap with the system-installed copy of python.
Since redo adds the redo/ dir to the $PATH before running .do files,
python.do might see its own previously-created target instead of the
"real" python when testing, and create an infinite loop by accident.
This commit is contained in:
Avery Pennarun 2018-12-05 00:27:52 -05:00
commit 99188bef0d
7 changed files with 8 additions and 9 deletions

View file

@ -1,3 +1,3 @@
exec >&2 exec >&2
redo-ifchange ../redo/version/all ../redo/python list redo-sh redo-ifchange ../redo/version/all ../redo/py list redo-sh
xargs redo-ifchange <list xargs redo-ifchange <list

View file

@ -1,7 +1,6 @@
redo-ifchange md2man.py ../redo/whichpython redo-ifchange md2man.py ../redo/py
read py <../redo/whichpython if ../redo/py ./md2man.py /dev/null /dev/null >/dev/null; then
if ../redo/python ./md2man.py /dev/null /dev/null >/dev/null; then echo '../redo/py ./md2man.py $2.md.tmp $2.html'
echo '../redo/python ./md2man.py $2.md.tmp $2.html'
else else
echo "Warning: md2man.py missing modules; can't generate manpages." >&2 echo "Warning: md2man.py missing modules; can't generate manpages." >&2
echo "Warning: try this: sudo easy_install markdown BeautifulSoup" >&2 echo "Warning: try this: sudo easy_install markdown BeautifulSoup" >&2

2
redo/.gitignore vendored
View file

@ -1,4 +1,4 @@
*.pyc *.pyc
sh sh
whichpython whichpython
python py

View file

@ -1,2 +1,2 @@
redo version/clean redo version/clean
rm -f whichpython python *.pyc */*.pyc rm -f whichpython python py *.pyc */*.pyc

View file

@ -1,6 +1,6 @@
# make sure redo doesn't think merely *reading* the old file counts as # make sure redo doesn't think merely *reading* the old file counts as
# modifying it in-place. # modifying it in-place.
cat $1 >/dev/null 2>/dev/null || true cat $1 >/dev/null 2>/dev/null || true
../../redo/python tick.py ../../redo/py tick.py
cat $1 >/dev/null 2>/dev/null || true cat $1 >/dev/null 2>/dev/null || true
echo hello echo hello

View file

@ -1,5 +1,5 @@
umask 0022 umask 0022
redo mode1 redo mode1
MODE=$(../../redo/python -c \ MODE=$(../../redo/py -c \
'import os; print oct(os.stat("mode1").st_mode & 07777)') 'import os; print oct(os.stat("mode1").st_mode & 07777)')
[ "$MODE" = "0644" ] || exit 78 [ "$MODE" = "0644" ] || exit 78