From 890ca62d42d684b2fff9e2c2c1c2fe03be342799 Mon Sep 17 00:00:00 2001
From: Mathieu Benoit <mathben@technolibre.ca>
Date: Sun, 4 Oct 2020 15:25:10 -0400
Subject: [PATCH] [FIX] update less to version 3.12.2 instead of 1.6.3 - Fix
 user documentation generation scss problem - Migration: remove lessc with
 sudo apt purge node-less

---
 docker/Dockerfile.base              | 6 ++++--
 script/install_OSX_dependency.sh    | 2 +-
 script/install_debian_dependency.sh | 6 ++++--
 3 files changed, 9 insertions(+), 5 deletions(-)

diff --git a/docker/Dockerfile.base b/docker/Dockerfile.base
index ac44c48..0b043b6 100644
--- a/docker/Dockerfile.base
+++ b/docker/Dockerfile.base
@@ -24,7 +24,6 @@ RUN apt-get update \
     fonts-noto-cjk \
     gnupg \
     libssl-dev \
-    node-less \
     npm \
     python3-num2words \
     python3-pip \
@@ -47,7 +46,6 @@ RUN apt-get update \
     libzip-dev \
     libldap2-dev \
     libsasl2-dev \
-    node-less \
     gdebi-core \
     libffi-dev \
     iproute2 \
@@ -86,6 +84,10 @@ RUN echo 'deb http://apt.postgresql.org/pub/repos/apt/ buster-pgdg main' > /etc/
 	&& apt-get install --no-install-recommends -y postgresql-client-12 libpq-dev \
     && rm -rf /var/lib/apt/lists/*
 
+# Install npm dependencies
+RUN npm install -g rtlcss less \
+    && ln -fs /usr/local/bin/lessc /usr/bin/lessc
+
 # Install python with pyenv
 # Reference https://github.com/bopen/docker-ubuntu-pyenv
 COPY pyenv-version.txt python-versions.txt /
diff --git a/script/install_OSX_dependency.sh b/script/install_OSX_dependency.sh
index 35bdbac..9806cc1 100755
--- a/script/install_OSX_dependency.sh
+++ b/script/install_OSX_dependency.sh
@@ -34,7 +34,7 @@ eval "$(docker-machine env default)"
 echo  "\n---- Installing nodeJS NPM and rtlcss for LTR support ----"
 brew install nodejs npm openssl
 sudo npm install -g rtlcss
-sudo npm install -g lessc
+sudo npm install -g less
 yes n|pyenv install 3.7.7
 pyenv local 3.7.7
 
diff --git a/script/install_debian_dependency.sh b/script/install_debian_dependency.sh
index 20f0e60..90e628f 100755
--- a/script/install_debian_dependency.sh
+++ b/script/install_debian_dependency.sh
@@ -40,13 +40,15 @@ sudo su - postgres -c "createuser -s ${EL_USER}" 2> /dev/null || true
 # Install Dependencies
 #--------------------------------------------------
 echo -e "\n--- Installing debian dependency --"
-sudo apt-get install git build-essential wget libxslt-dev libzip-dev libldap2-dev libsasl2-dev node-less libpng12-0 gdebi-core libffi-dev libbz2-dev -y
+sudo apt-get install git build-essential wget libxslt-dev libzip-dev libldap2-dev libsasl2-dev libpng12-0 gdebi-core libffi-dev libbz2-dev -y
 sudo apt-get install libmariadbd-dev -y
 
 echo -e "\n---- Installing nodeJS NPM and rtlcss for LTR support ----"
 sudo apt-get install nodejs npm -y
 sudo npm install -g rtlcss
-sudo npm install -g lessc
+sudo npm install -g less
+
+sudo ln -fs /usr/local/bin/lessc /usr/bin/lessc
 
 if [ ${EL_INSTALL_NGINX} = "True" ]; then
   echo -e "\n---- Installing nginx ----"