Master update

bin/build_tuhh.sh

@@ -27,6 +27,7 @@
 #
 
 # Check commandline arguments
+PROJECT_PATH=""
 if [ $# -lt 1 ]
 then
     RESEARCH_DEPLOY=$RESEARCH_ROOT/build-tuhh
@@ -35,9 +36,14 @@ elif [ $# -lt 2 ]
 then
     RESEARCH_DEPLOY=$1
     PROJECT_ROOT=""
-else
+elif [ $# -lt 3 ]
+then
     RESEARCH_DEPLOY=$1
     PROJECT_ROOT=$2
+else
+    RESEARCH_DEPLOY=$1
+    PROJECT_ROOT=$2 # full path
+    PROJECT_PATH=$3 # path without web root
 fi
 echo "Deploying to $RESEARCH_DEPLOY."
 echo "Using PROJECT_ROOT=$PROJECT_ROOT"
@@ -80,7 +86,10 @@ $RESEARCH_BIN/create_html.sh $RESEARCH_BUILD/forschung/topics \
 echo "Inserting SSI-directives..."
 $RESEARCH_BIN/replace_ssi_marker.sh $RESEARCH_DEPLOY/forschung/topics \
                                     $RESEARCH_BUILD/forschung/topics \
-                                    $PROJECT_ROOT >> $RESEARCH_BUILD/build.log 2>&1
+                                    $PROJECT_PATH >> $RESEARCH_BUILD/build.log 2>&1
+
+#delete <h1> tag
+$RESEARCH_BIN/postproc_topics.sh $RESEARCH_DEPLOY/forschung/topics
 
 #delete <h1> tag
 $RESEARCH_BIN/postproc_topics.sh $RESEARCH_DEPLOY/forschung/topics
@@ -124,6 +133,6 @@ chmod +x $RESEARCH_DEPLOY/include/html/*.html
 
 echo "Done."
 echo "Start apache by running the command"
-echo "  docker run -it --rm --name apache-server -p 8080:80 -v $RESEARCH_DEPLOY:/usr/local/apache2/htdocs/ eltenedor/alpine-httpd-ssi:latest"
+echo "  docker run -it --rm --name apache-server -p 8080:80 -v $RESEARCH_DEPLOY:/usr/local/apache2/htdocs/ eltenedor/alpine-www3-dev:latest"
 echo "Then visit localhost:8080 in your web browser."
 echo "Alternatively review file://$RESEARCH_DEPLOY/index.html in your web browser."