From 95c455565d42bfcdd56358a422420474c5110164 Mon Sep 17 00:00:00 2001 From: Emmanuel Viennet Date: Mon, 26 Aug 2024 01:51:12 +0200 Subject: [PATCH] minor/cosmetic --- app/static/js/releve-but.js | 2 +- tools/debian/postinst | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/app/static/js/releve-but.js b/app/static/js/releve-but.js index 3f7784b7..5958da6f 100644 --- a/app/static/js/releve-but.js +++ b/app/static/js/releve-but.js @@ -328,7 +328,7 @@ class releveBUT extends HTMLElement { this.shadow.querySelector(".decision").innerHTML = "Décision jury: " + (data.semestre.decision?.code || ""); }*/ this.shadow.querySelector("#ects_tot").innerHTML = - "ECTS : " + + "ECTS semestre : " + (data.semestre.ECTS?.acquis ?? "-") + " / " + (data.semestre.ECTS?.total ?? "-"); diff --git a/tools/debian/postinst b/tools/debian/postinst index 26a550d5..539f1847 100755 --- a/tools/debian/postinst +++ b/tools/debian/postinst @@ -27,8 +27,8 @@ set_scodoc_var_dir # ------------ LOCALES (pour compat bases ScoDoc 7 et plus anciennes) for locname in "en_US.UTF-8" do - outname=$(echo ${locname//-/} | tr '[A-Z]' '[a-z]') - if [ "$(locale -a | grep -E -i ^${outname}$ | wc -l)" -lt 1 ] + outname=$(echo ${locname//-/} | tr '[:upper:]' '[:lower:]') + if [ "$(locale -a | grep -c -E -i ^${outname}$ )" -lt 1 ] then echo adding $locname echo "$locname ${locname##*.}" >> /etc/locale.gen @@ -40,7 +40,7 @@ echo "debian postinst: scodoc9 systemd service is $(systemctl is-active scodoc9) systemctl restart postgresql # Le numero de version complet, genre 9.0.0 -SCODOC_RELEASE=$(grep SCOVERSION $SCODOC_DIR/sco_version.py | awk '{ print substr($3, 2, length($3)-2) }') +SCODOC_RELEASE=$(grep SCOVERSION "$SCODOC_DIR/sco_version.py" | awk '{ print substr($3, 2, length($3)-2) }') if [ -e "${SCODOC_VERSION_DIR}/scodoc.sn" ] then # upgrading