Skip to content

Commit

Permalink
s/ronn/marked-man/g
Browse files Browse the repository at this point in the history
  • Loading branch information
isaacs committed Sep 11, 2014
1 parent 6e6a5fb commit ab8dd87
Show file tree
Hide file tree
Showing 4 changed files with 22 additions and 22 deletions.
2 changes: 1 addition & 1 deletion .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ npm-debug.log
/test/packages/npm-test-depends-on-spark/which-spark.log
/test/packages/test-package/random-data.txt
/test/root
/node_modules/ronn
/node_modules/marked-man
/node_modules/tap
/node_modules/nock
/node_modules/.bin
Expand Down
16 changes: 8 additions & 8 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -72,7 +72,7 @@ dev: install
link: uninstall
node cli.js link -f

clean: markedclean ronnclean doc-clean uninstall
clean: markedclean marked-manclean doc-clean uninstall
rm -rf npmrc
node cli.js cache clean

Expand All @@ -84,19 +84,19 @@ doc: $(mandocs) $(htmldocs)
markedclean:
rm -rf node_modules/marked node_modules/.bin/marked .building_marked

ronnclean:
rm -rf node_modules/ronn node_modules/.bin/ronn .building_ronn
marked-manclean:
rm -rf node_modules/marked-man node_modules/.bin/marked-man .building_marked-man

docclean: doc-clean
doc-clean:
rm -rf \
.building_marked \
.building_ronn \
.building_marked-man \
html/doc \
html/api \
man

# use `npm install ronn` for this to work.
# use `npm install marked-man` for this to work.
man/man1/npm-README.1: README.md scripts/doc-build.sh package.json
@[ -d man/man1 ] || mkdir -p man/man1
scripts/doc-build.sh $< $@
Expand Down Expand Up @@ -161,10 +161,10 @@ marked: node_modules/.bin/marked
node_modules/.bin/marked:
node cli.js install marked --no-global

ronn: node_modules/.bin/ronn
marked-man: node_modules/.bin/marked-man

node_modules/.bin/ronn:
node cli.js install ronn --no-global
node_modules/.bin/marked-man:
node cli.js install marked-man --no-global

doc: man

Expand Down
2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -150,11 +150,11 @@
],
"devDependencies": {
"marked": "~0.3.2",
"marked-man": "~0.1.3",
"nock": "~0.34.1",
"npm-registry-couchapp": "~2.5.3",
"npm-registry-mock": "~0.6.3",
"require-inject": "~1.0.0",
"ronn": "~0.3.6",
"tap": "~0.4.12"
},
"engines": {
Expand Down
24 changes: 12 additions & 12 deletions scripts/doc-build.sh
Original file line number Diff line number Diff line change
Expand Up @@ -6,26 +6,26 @@ fi
set -o errexit
set -o pipefail

if ! [ -x node_modules/.bin/ronn ]; then
if ! [ -x node_modules/.bin/marked-man ]; then
ps=0
if [ -f .building_ronn ]; then
pid=$(cat .building_ronn)
if [ -f .building_marked-man ]; then
pid=$(cat .building_marked-man)
ps=$(ps -p $pid | grep $pid | wc -l) || true
fi

if [ -f .building_ronn ] && [ $ps != 0 ]; then
while [ -f .building_ronn ]; do
if [ -f .building_marked-man ] && [ $ps != 0 ]; then
while [ -f .building_marked-man ]; do
sleep 1
done
else
# a race to see which make process will be the one to install ronn
echo $$ > .building_ronn
# a race to see which make process will be the one to install marked-man
echo $$ > .building_marked-man
sleep 1
if [ $(cat .building_ronn) == $$ ]; then
make node_modules/.bin/ronn
rm .building_ronn
if [ $(cat .building_marked-man) == $$ ]; then
make node_modules/.bin/marked-man
rm .building_marked-man
else
while [ -f .building_ronn ]; do
while [ -f .building_marked-man ]; do
sleep 1
done
fi
Expand Down Expand Up @@ -68,7 +68,7 @@ mkdir -p $(dirname $dest)

case $dest in
*.[1357])
./node_modules/.bin/ronn --roff $src \
./node_modules/.bin/marked-man --roff $src \
| sed "s|@VERSION@|$version|g" \
| perl -pi -e 's/(npm\\-)?([a-zA-Z\\\.\-]*)\(1\)/npm help \2/g' \
| perl -pi -e 's/(npm\\-)?([a-zA-Z\\\.\-]*)\(([57])\)/npm help \3 \2/g' \
Expand Down

0 comments on commit ab8dd87

Please sign in to comment.