weeheavy/pelican-theme
1
0
Fork 0
forked from github/pelican
Code Pull requests Activity

Merge pull request #2317 from Siltaar/master

Browse source 
Allow develop_server.sh to work with paths containing spaces
This commit is contained in:
Justin Mayer 2018-04-06 11:39:14 -07:00 • committed by GitHub
commit 5fed5d9118
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 14 additions and 14 deletions
Download patch file Download diff file Expand all files Collapse all files

28
pelican/tools/templates/develop_server.sh.jinja2
View file

@ -7,16 +7,16 @@ PELICAN=${PELICAN:-pelican}
PELICANOPTS={{pelicanopts}}
BASEDIR=$(pwd)
INPUTDIR=$BASEDIR/content
OUTPUTDIR=$BASEDIR/output
CONFFILE=$BASEDIR/pelicanconf.py
INPUTDIR="$BASEDIR"/content
OUTPUTDIR="$BASEDIR"/output
CONFFILE="$BASEDIR"/pelicanconf.py
###
# Don't change stuff below here unless you are sure
###
SRV_PID=$BASEDIR/srv.pid
PELICAN_PID=$BASEDIR/pelican.pid
SRV_PID="$BASEDIR"/srv.pid
PELICAN_PID="$BASEDIR"/pelican.pid
function usage(){
echo "usage: $0 (stop) (start) (restart) [port]"
@ -32,7 +32,7 @@ function alive() {
}
function shut_down(){
PID=$(cat $SRV_PID)
PID=$(cat "$SRV_PID")
if [[ $? -eq 0 ]]; then
if alive $PID; then
echo "Stopping HTTP server"
@ -40,12 +40,12 @@ function shut_down(){
else
echo "Stale PID, deleting"
fi
rm $SRV_PID
rm "$SRV_PID"
else
echo "HTTP server PIDFile not found"
fi
PID=$(cat $PELICAN_PID)
PID=$(cat "$PELICAN_PID")
if [[ $? -eq 0 ]]; then
if alive $PID; then
echo "Killing Pelican"
@ -53,7 +53,7 @@ function shut_down(){
else
echo "Stale PID, deleting"
fi
rm $PELICAN_PID
rm "$PELICAN_PID"
else
echo "Pelican PIDFile not found"
fi
@ -63,14 +63,14 @@ function start_up(){
local port=$1
echo "Starting up Pelican and HTTP server"
shift
$PELICAN --debug --autoreload -r $INPUTDIR -o $OUTPUTDIR -s $CONFFILE $PELICANOPTS &
$PELICAN --debug --autoreload -r "$INPUT"DIR -o "$OUTPUTDIR" -s "$CONFFILE" $PELICANOPTS &
pelican_pid=$!
echo $pelican_pid > $PELICAN_PID
mkdir -p $OUTPUTDIR && cd $OUTPUTDIR
echo $pelican_pid > "$PELICAN_PID"
mkdir -p "$OUTPUTDIR" && cd "$OUTPUTDIR"
$PY -m pelican.server $port &
srv_pid=$!
echo $srv_pid > $SRV_PID
cd $BASEDIR
echo $srv_pid > "$SRV_PID"
cd "$BASEDIR"
sleep 1
if ! alive $pelican_pid ; then
echo "Pelican didn't start. Is the Pelican package installed?"