From e9c2409eab1d68959b16db0e69d06e4699db262a Mon Sep 17 00:00:00 2001
From: Siltaar <siltaar@d12s.fr>
Date: Thu, 29 Mar 2018 15:05:00 +0200
Subject: [PATCH 1/2] Allow develop_server.sh to work with paths containing
 spaces

---
 .../tools/templates/develop_server.sh.jinja2  | 28 +++++++++----------
 1 file changed, 14 insertions(+), 14 deletions(-)

diff --git a/pelican/tools/templates/develop_server.sh.jinja2 b/pelican/tools/templates/develop_server.sh.jinja2
index b8f6c029..aa0c7672 100755
--- a/pelican/tools/templates/develop_server.sh.jinja2
+++ b/pelican/tools/templates/develop_server.sh.jinja2
@@ -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 "$OUTPUT"DIR -s "$CONFFILE" $PELICANOPTS &
   pelican_pid=$!
-  echo $pelican_pid > $PELICAN_PID
-  mkdir -p $OUTPUTDIR && cd $OUTPUTDIR
+  echo $pelican_pid > "$PELICAN_PID"
+  mkdir -p "$OUTPUT"DIR && cd "$OUTPUT"DIR
   $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?"

From 9e035ed7272f07785316c60d03901f1534642d66 Mon Sep 17 00:00:00 2001
From: Siltaar <siltaar@d12s.fr>
Date: Thu, 29 Mar 2018 15:20:10 +0200
Subject: [PATCH 2/2] fix ""DIR

---
 pelican/tools/templates/develop_server.sh.jinja2 | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pelican/tools/templates/develop_server.sh.jinja2 b/pelican/tools/templates/develop_server.sh.jinja2
index aa0c7672..7d20fd22 100755
--- a/pelican/tools/templates/develop_server.sh.jinja2
+++ b/pelican/tools/templates/develop_server.sh.jinja2
@@ -63,10 +63,10 @@ function start_up(){
   local port=$1
   echo "Starting up Pelican and HTTP server"
   shift
-  $PELICAN --debug --autoreload -r "$INPUT"DIR -o "$OUTPUT"DIR -s "$CONFFILE" $PELICANOPTS &
+  $PELICAN --debug --autoreload -r "$INPUT"DIR -o "$OUTPUTDIR" -s "$CONFFILE" $PELICANOPTS &
   pelican_pid=$!
   echo $pelican_pid > "$PELICAN_PID"
-  mkdir -p "$OUTPUT"DIR && cd "$OUTPUT"DIR
+  mkdir -p "$OUTPUTDIR" && cd "$OUTPUTDIR"
   $PY -m pelican.server $port &
   srv_pid=$!
   echo $srv_pid > "$SRV_PID"