Work with python3.
parent
794cf1d609
commit
d1a3350304
|
@ -32,14 +32,14 @@ function shut_down(){
|
|||
PID=$(cat $SRV_PID)
|
||||
PROCESS=$(ps -p $PID | tail -n 1 | awk '{print $4}')
|
||||
if [[ $PROCESS != "" ]]; then
|
||||
echo "Killing SimpleHTTPServer"
|
||||
echo "Killing http.server"
|
||||
kill $PID
|
||||
else
|
||||
echo "Stale PID, deleting"
|
||||
fi
|
||||
rm $SRV_PID
|
||||
else
|
||||
echo "SimpleHTTPServer PIDFile not found"
|
||||
echo "http.server PIDFile not found"
|
||||
fi
|
||||
|
||||
if [[ -f $PELICAN_PID ]]; then
|
||||
|
@ -58,7 +58,7 @@ function shut_down(){
|
|||
}
|
||||
|
||||
function start_up(){
|
||||
echo "Starting up Pelican and SimpleHTTPServer"
|
||||
echo "Starting up Pelican and http.server"
|
||||
shift
|
||||
$PELICAN --debug --autoreload -r $INPUTDIR -o $OUTPUTDIR -s $CONFFILE $PELICANOPTS &
|
||||
echo $! > $PELICAN_PID
|
||||
|
@ -66,10 +66,10 @@ function start_up(){
|
|||
mkdir $OUTPUTDIR
|
||||
fi
|
||||
cd $OUTPUTDIR
|
||||
python -m SimpleHTTPServer &
|
||||
python3 -m http.server &
|
||||
echo $! > $SRV_PID
|
||||
cd $BASEDIR
|
||||
sleep 1 && echo 'Pelican and SimpleHTTPServer processes now running in background.'
|
||||
sleep 1 && echo 'Pelican and http.server processes now running in background.'
|
||||
}
|
||||
|
||||
###
|
||||
|
|
Loading…
Reference in New Issue