From 200d48c4142d5b5e01c244452d2327d30b4fc063 Mon Sep 17 00:00:00 2001
From: LucFabresse <luc.fabresse@gmail.com>
Date: Wed, 1 Apr 2020 11:05:27 +0200
Subject: [PATCH] cleaning2

---
 .gitignore  |   2 -
 .travis.yml |   4 +-
 download.sh | 108 ----------------------------------------------------
 pillar.conf |   6 +--
 4 files changed, 4 insertions(+), 116 deletions(-)
 delete mode 100755 download.sh

diff --git a/.gitignore b/.gitignore
index f89dd56..7ef513c 100644
--- a/.gitignore
+++ b/.gitignore
@@ -20,5 +20,3 @@ stdout
 /PharoDebug.log
 /auto
 mustache
-/TinyBlogImages5
-/TinyBlogImages6
diff --git a/.travis.yml b/.travis.yml
index 31f3a51..61a4533 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -23,8 +23,8 @@ script:
 
 after_success:
   - wget -c https://github.com/probonopd/uploadtool/raw/master/upload.sh
-  - mv _result/pdf/book.pdf Tiny.pdf
-  - bash upload.sh Tiny.pdf
+  - mv _result/pdf/book.pdf TinyBlog-FR.pdf
+  - bash upload.sh TinyBlog-FR.pdf
 
 branches:
   except:
diff --git a/download.sh b/download.sh
deleted file mode 100755
index b8eef90..0000000
--- a/download.sh
+++ /dev/null
@@ -1,108 +0,0 @@
-#!/usr/bin/env bash
-PHARO_VM=${PHARO_VM:-./pharo}
-
-pillar_version="stable"
-pharo_version="50"
-vm_enable=0
-img_enable=0
-
-usage() {
-    cat <<HELP
-Usage: $0 [-h|--help] [vm] [image] [-p|--pharo version] [dev]
-
-Downloads the latest image and virtual machine (edit the script to set from where).  By default, only the image will be downloaded.
-
-image: $IMAGE_URL
-   VM: $VM_INSTALL_URL
-HELP
-}
-
-get_vm() {
-    if [ -d pharo-vm ]; then
-        rm -rf pharo-vm
-    fi
-    wget ${CERTCHECK} --output-document - "$VM_INSTALL_URL" | bash
-}
-
-get_image() {
-    local tempzip="$(mktemp imageXXXXX.zip)"
-    trap "rm '$tempzip'" EXIT
-
-    wget ${CERTCHECK} --progress=bar:force --output-document="$tempzip" "$IMAGE_URL"
-    for f in $(unzip -Z -1 "$tempzip"); do
-        ext="${f##*.}"
-        file=$(basename $f)
-        if [ "$ext" == image -o "$ext" == changes ]; then
-            echo "Pharo.$ext"
-            unzip -qp  "$tempzip" "$f" > "Pharo.$ext"
-        elif [ $(basename $f) == "pillar" ]; then
-            echo pillar
-            unzip -qp  "$tempzip" "$f" > "pillar"
-            chmod +x pillar
-        elif [ $(basename $f) == "mustache" ]; then
-            echo mustache
-            unzip -qp  "$tempzip" "$f" > "mustache"
-            chmod +x mustache
-        fi
-    done
-}
-prepare_image() {
-    ${PHARO_VM} Pharo.image --no-default-preferences eval --save "StartupPreferencesLoader allowStartupScript: false."
-    ${PHARO_VM} Pharo.image eval --save "Deprecation raiseWarning: false; showWarning: false. 'ok'"
-}
-
-# stop the script if a single command fails
-set -e
-
-# on mac os wget can be quite old and not recognizing --no-check-certificate
-CERTCHECK="--no-check-certificate"
-wget --help | grep -- "$CERTCHECK" 2>&1 > /dev/null || CERTCHECK=''
-
-should_prepare_image=0
-
-if [ $# -eq 0 ]; then
-    vm_enable=1
-    img_enable=1
-else
-    while [ $# -gt 0 ]; do
-        case "$1" in
-            -h|--help|help)
-                usage; exit 0;;
-            v|vm)
-                vm_enable=1;;
-            i|img|image)
-                img_enable=1;;
-            d|dev|development)
-                pillar_version="development";;
-            -p|--pharo)
-                shift;
-                pharo_version=$1;;
-            *) # boom
-                usage; exit 1;;
-        esac
-        shift
-    done
-fi
-
-
-if [[ $vm_enable == 0 && $img_enable == 0 ]]; then
-    vm_enable=1
-    img_enable=1
-fi
-
-IMAGE_URL="https://github.com/pillar-markup/pillar/releases/download/v5.0/Pillar-deployment$pharo_version.zip"
-VM_INSTALL_URL="http://get.pharo.org/vm$pharo_version"
-
-if [[ $vm_enable == 1 || $img_enable == 0 ]]; then
-    get_vm
-fi
-
-if [[ $vm_enable == 0 || $img_enable == 1 ]]; then
-    get_image
-    should_prepare_image=1
-fi
-
-if [[ $should_prepare_image -eq 1 ]]; then
-    echo Preparing Pillar image
-    prepare_image
-fi
diff --git a/pillar.conf b/pillar.conf
index 2d05e24..e6d5dba 100644
--- a/pillar.conf
+++ b/pillar.conf
@@ -1,16 +1,14 @@
 {
-  "base_url": "/booklet-ReflectiveCore/html",
+  "base_url": "/TinyBlog-FR/html",
   "site_name": "TinyBlog",
   "title":"TinyBlog: Créer votre Première Application Web avec Pharo",
   "attribution":"Olivier Auverlot, Stéphane Ducasse et Luc Fabresse",
   "series": "The Pharo TextBook Collection",
   "keywords": "tutoriel, développement web, Seaside, Pharo, Mongo, Smalltalk",
-  "language": "en-UK",
+  "language": "fr-FR",
   "epub-id": "urn:uuid:A1B0D67E-2E81-4DF5-9E67-A64CBE366809",
   "tocFile": "index.pillar",
   "latexWriter" : #'latex:sbabook',
-  "plugins": ["PRCitationTransformer"],
-  "bibFile": "others.bib",
   "newLine": #unix,
   "htmlWriter": #html
 }