github/pelican
1
0
Fork 1
mirror of https://github.com/getpelican/pelican.git synced 2025-10-15 20:28:56 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

Improve devserver durability. Refs #473.

Browse source 
Three changes:

1. Fix inconsistent "pwd" behavior by using make's $(CURDIR) builtin.
2. Change bash shebang to the more-portable form.
3. Tell users when Pelican and SimpleHTTPServer have been backgrounded.
This commit is contained in:
Justin Mayer 2012-08-27 13:09:25 -07:00
commit 000210d875
2 changed files with 3 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

2
pelican/tools/templates/Makefile.in
View file

@ -1,7 +1,7 @@
PELICAN=$pelican PELICAN=$pelican
PELICANOPTS=$pelicanopts PELICANOPTS=$pelicanopts
BASEDIR=$$(pwd) BASEDIR=$$(CURDIR)
INPUTDIR=$$(BASEDIR)/content INPUTDIR=$$(BASEDIR)/content
OUTPUTDIR=$$(BASEDIR)/output OUTPUTDIR=$$(BASEDIR)/output
CONFFILE=$$(BASEDIR)/pelicanconf.py CONFFILE=$$(BASEDIR)/pelicanconf.py

3
pelican/tools/templates/develop_server.sh.in
View file

@ -1,4 +1,4 @@
#!/bin/bash #!/usr/bin/env bash
## ##
# This section should match your Makefile # This section should match your Makefile
## ##
@ -65,6 +65,7 @@ function start_up(){
python -m SimpleHTTPServer & python -m SimpleHTTPServer &
echo $$! > $$SRV_PID echo $$! > $$SRV_PID
cd $$BASEDIR cd $$BASEDIR
sleep 1 && echo 'Pelican and SimpleHTTPServer processes now running in background.'
} }
### ###