Merge branch 'lh-no-matomo' into 'develop'

Option to not use matomo

See merge request !187

contribute.py

@@ -7,8 +7,9 @@ from shutil import copyfile
 @click.command()
 @click.option('--date', default=datetime.datetime.today().strftime('%Y-%m-%d'), help='Date of the presentation - format: YYYY-MM-DD')
 @click.option('--name', default='myPresentation', help='Short name of the presentation.')
+@click.option('--analytics', default='yes', help='Analytics setting')
 
-def main(date, name):
+def main(date, name, analytics):
     """Copies the template folder"""
 
     # validate the date
@@ -86,11 +87,14 @@ def main(date, name):
         click.echo(' > All dependencies already installed.')
 
     # add analytics
-    os.system('sed -i "/matomohead/r./../../.ci/analytics/head.html" theme/templates/_index.html')
-    os.system('sed -i "/matomopolicy/r./../../.ci/analytics/policy.html" theme/templates/_index.html')
-    os.system('sed -i "/matomobanner/r./../../.ci/analytics/gdpr-banner.html" theme/templates/_index.html')
+    if analytics == "yes":
+        os.system('sed -i "/matomohead/r./../../.ci/analytics/head.html" theme/templates/_index.html')
+        os.system('sed -i "/matomopolicy/r./../../.ci/analytics/policy.html" theme/templates/_index.html')
+        os.system('sed -i "/matomobanner/r./../../.ci/analytics/gdpr-banner.html" theme/templates/_index.html')
 
-    click.echo(' > Matomo added.')
+        click.echo(' > Matomo added.')
+    else:
+        click.echo(' > No analytics.')
 
     # launch the server
     os.system('grunt server')

contribute.sh

@@ -7,28 +7,30 @@ dockerPort="9000"
 helpFunction()
 {
    echo ""
-   echo "Usage: $0 -d parameterDate -n parameterName"
+   echo "Usage: $0 -d parameterDate -n parameterName -a parameterAnalytics"
    echo -e "\t-d Date of presentation"
    echo -e "\t-n Name of presentation"
+   echo -e "\t-a [yes/no] for integration of analytics"
    exit 1 # Exit script after printing help
 }
 
-while getopts "d:n:" opt
+while getopts "d:n:a:" opt
 do
    case "$opt" in
       d ) parameterDate="$OPTARG" ;;
       n ) parameterName="$OPTARG" ;;
+      a ) parameterAnalytics="$OPTARG" ;;
       ? ) helpFunction ;; # Print helpFunction in case parameter is non-existent
    esac
 done
 
 # Print helpFunction in case parameters are empty
-if [ -z "$parameterDate" ] || [ -z "$parameterName" ]
+if [ -z "$parameterDate" ] || [ -z "$parameterName" ] || [ -z "$parameterAnalytics" ]
 then
    echo "Some or all of the parameters are empty";
    helpFunction
 fi
 
 # launch the docker file
-cmd="python contribute.py --date=\"$parameterDate\" --name=\"$parameterName\""
+cmd="python contribute.py --date=\"$parameterDate\" --name=\"$parameterName\" --analytics=\"$parameterAnalytics\""
 docker run -p $dockerPort:$dockerPort --user $(id -u):$(id -g) -it -v $(pwd)/:/presentation $dockerImg /bin/bash -c "$cmd"