From 261eda9362d63886d7ffb97b8ede6921141b8feb Mon Sep 17 00:00:00 2001 From: Nebz <28622481+NebzHB@users.noreply.github.com> Date: Tue, 27 Aug 2024 08:56:02 +0200 Subject: [PATCH 01/11] Update install_nodejs.sh --- install_nodejs.sh | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/install_nodejs.sh b/install_nodejs.sh index 9de7c9d..b3963f6 100644 --- a/install_nodejs.sh +++ b/install_nodejs.sh @@ -85,7 +85,7 @@ fi #end of support buster except smart lsb_release -c | grep -q buster -if [ $? -eq 0 ]; then +if [ $? -eq 0 ] && [ "${noSupport:-false}" != true ]; then if [ ! -f /media/boot/multiboot/meson64_odroidc2.dtb.linux ]; then today=$(date +%Y%m%d) if [[ "$today" > "20240630" ]]; then @@ -94,11 +94,13 @@ if [ $? -eq 0 ]; then echo -e ":fg-danger:$HR:/fg:" >> $TMPFOLDER/errorLog.$$ echo -e ":fg-danger:== ATTENTION Debian 10 Buster n'est officiellement plus supportée depuis le 30 juin 2024, merci de mettre à jour votre système en version plus récente de Debian !!!:/fg:" >> $TMPFOLDER/errorLog.$$ echo -e ":fg-danger:== Les dépendances sont bloquées afin d'éviter tout problème, soit $PLUGIN fonctionne et donc on y touche plus tant qu'il tourne, soit il ne fonctionne plus et donc il faut mettre à jour votre système en version plus récente de Debian.:/fg:" >> $TMPFOLDER/errorLog.$$ + echo -e ":fg-danger:== Fin Septembre, Jeedom passe à NodeJS 20 qui est incompatible avec Debian 10. PLUS AUCUN SUPPORT NE SERA FAIT !!! Migrez donc au plus vite !:/fg:" >> $TMPFOLDER/errorLog.$$ echo -e ":fg-danger:$HR:/fg:" >> $TMPFOLDER/errorLog.$$ else echo -e ":fg-danger:$HR:/fg:" >> $TMPFOLDER/errorLog.$$ echo -e ":fg-danger:== WARNING Debian 10 Buster is not supported anymore since June 30, 2024. Please update your system in a new Debian version!!!:/fg:" >> $TMPFOLDER/errorLog.$$ echo -e ":fg-danger:== Dependencies are blocked to avoid any issues. Either $PLUGIN works and so we don't touch the dependencies as long as it works, or it doesn't work anymore and you have to update your system in a new Debian version.:/fg:" >> $TMPFOLDER/errorLog.$$ + echo -e ":fg-danger:== End of September, Jeedom will upgrade to NodeJS 20 that's incompatible with Debian 10. NO SUPPORT WILL BE DONE ANYMORE !!! Please migrate ASAP !:/fg:" >> $TMPFOLDER/errorLog.$$ echo -e ":fg-danger:$HR:/fg:" >> $TMPFOLDER/errorLog.$$ fi post From b5f4dd0c9891b3a7dceb06fd143f69152ac36281 Mon Sep 17 00:00:00 2001 From: Nebz <28622481+NebzHB@users.noreply.github.com> Date: Tue, 27 Aug 2024 09:16:10 +0200 Subject: [PATCH 02/11] Update install_nodejs.sh --- install_nodejs.sh | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/install_nodejs.sh b/install_nodejs.sh index b3963f6..6104a49 100644 --- a/install_nodejs.sh +++ b/install_nodejs.sh @@ -85,7 +85,8 @@ fi #end of support buster except smart lsb_release -c | grep -q buster -if [ $? -eq 0 ] && [ "${noSupport:-false}" != true ]; then +buster=$? +if [ $buster -eq 0 ] && [ "${noSupport:-false}" != true ]; then if [ ! -f /media/boot/multiboot/meson64_odroidc2.dtb.linux ]; then today=$(date +%Y%m%d) if [[ "$today" > "20240630" ]]; then @@ -124,6 +125,9 @@ if [ $? -eq 0 ] && [ "${noSupport:-false}" != true ]; then fi fi fi +if [ $buster -eq 0 ] && [ "${noSupport:-false}" == true ]; then + echo -e ":fg-warning:== Vous avez refusé le support, L'installation des dépendances va se lancer mais il est possible que ça ne fonctionne pas...:/fg:" +} #x86 32 bits not supported by nodesource anymore bits=$(getconf LONG_BIT) From 68a00159dc2624cf9a4dcbf76545998298114b5f Mon Sep 17 00:00:00 2001 From: Nebz <28622481+NebzHB@users.noreply.github.com> Date: Tue, 27 Aug 2024 09:25:30 +0200 Subject: [PATCH 03/11] Update install_nodejs.sh --- install_nodejs.sh | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/install_nodejs.sh b/install_nodejs.sh index 6104a49..52430a2 100644 --- a/install_nodejs.sh +++ b/install_nodejs.sh @@ -126,7 +126,11 @@ if [ $buster -eq 0 ] && [ "${noSupport:-false}" != true ]; then fi fi if [ $buster -eq 0 ] && [ "${noSupport:-false}" == true ]; then - echo -e ":fg-warning:== Vous avez refusé le support, L'installation des dépendances va se lancer mais il est possible que ça ne fonctionne pas...:/fg:" + if [ "$LANG_DEP" = "fr" ]; then + echo -e ":fg-warning:== Vous avez refusé le support, L'installation des dépendances va se lancer mais il est possible que ça ne fonctionne pas...:/fg:" + else + echo -e ":fg-warning:== You have denied any support, Dependencies install will start, but it's possible it doesn't work...:/fg:" + fi } #x86 32 bits not supported by nodesource anymore From f6b5ebf508b82021c5732cef8d163ae0ca7ce7eb Mon Sep 17 00:00:00 2001 From: Nebz <28622481+NebzHB@users.noreply.github.com> Date: Tue, 27 Aug 2024 09:33:36 +0200 Subject: [PATCH 04/11] Update install_nodejs.sh --- install_nodejs.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/install_nodejs.sh b/install_nodejs.sh index 52430a2..87c55a8 100644 --- a/install_nodejs.sh +++ b/install_nodejs.sh @@ -125,7 +125,7 @@ if [ $buster -eq 0 ] && [ "${noSupport:-false}" != true ]; then fi fi fi -if [ $buster -eq 0 ] && [ "${noSupport:-false}" == true ]; then +if [ $buster -eq 0 ] && [ "${noSupport:-false}" != false ]; then if [ "$LANG_DEP" = "fr" ]; then echo -e ":fg-warning:== Vous avez refusé le support, L'installation des dépendances va se lancer mais il est possible que ça ne fonctionne pas...:/fg:" else From 8482fb45f80ad65b4791a9e766b33323c118c35e Mon Sep 17 00:00:00 2001 From: Nebz <28622481+NebzHB@users.noreply.github.com> Date: Tue, 27 Aug 2024 09:36:44 +0200 Subject: [PATCH 05/11] Update install_nodejs.sh --- install_nodejs.sh | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/install_nodejs.sh b/install_nodejs.sh index 87c55a8..9ca4705 100644 --- a/install_nodejs.sh +++ b/install_nodejs.sh @@ -127,9 +127,11 @@ if [ $buster -eq 0 ] && [ "${noSupport:-false}" != true ]; then fi if [ $buster -eq 0 ] && [ "${noSupport:-false}" != false ]; then if [ "$LANG_DEP" = "fr" ]; then - echo -e ":fg-warning:== Vous avez refusé le support, L'installation des dépendances va se lancer mais il est possible que ça ne fonctionne pas...:/fg:" + echo -e ":fg-warning:== Vous avez refusé le support, Vous utilisez toujours Debian 10 Buster, L'installation des dépendances va se lancer mais il est possible que ça ne fonctionne pas...:/fg:" + echo -e ":fg-danger:== Fin Septembre, Jeedom passe à NodeJS 20 qui est incompatible avec Debian 10. PLUS AUCUN SUPPORT NE SERA FAIT !!! Migrez donc au plus vite !:/fg:" else echo -e ":fg-warning:== You have denied any support, Dependencies install will start, but it's possible it doesn't work...:/fg:" + echo -e ":fg-danger:== End of September, Jeedom will upgrade to NodeJS 20 that's incompatible with Debian 10. NO SUPPORT WILL BE DONE ANYMORE !!! Please migrate ASAP !:/fg:" fi } From f59b42ff2983ff7b5e2ee2d40e89f7592758fbd9 Mon Sep 17 00:00:00 2001 From: Nebz <28622481+NebzHB@users.noreply.github.com> Date: Tue, 27 Aug 2024 09:39:39 +0200 Subject: [PATCH 06/11] Update install_nodejs.sh --- install_nodejs.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/install_nodejs.sh b/install_nodejs.sh index 9ca4705..f1c42ab 100644 --- a/install_nodejs.sh +++ b/install_nodejs.sh @@ -133,7 +133,7 @@ if [ $buster -eq 0 ] && [ "${noSupport:-false}" != false ]; then echo -e ":fg-warning:== You have denied any support, Dependencies install will start, but it's possible it doesn't work...:/fg:" echo -e ":fg-danger:== End of September, Jeedom will upgrade to NodeJS 20 that's incompatible with Debian 10. NO SUPPORT WILL BE DONE ANYMORE !!! Please migrate ASAP !:/fg:" fi -} +fi #x86 32 bits not supported by nodesource anymore bits=$(getconf LONG_BIT) From 7dddd6e733ad42e794b275a5f2a0416c4cc125f8 Mon Sep 17 00:00:00 2001 From: Nebz <28622481+NebzHB@users.noreply.github.com> Date: Tue, 27 Aug 2024 09:46:09 +0200 Subject: [PATCH 07/11] Create shellLint.yml --- .github/workflows/shellLint.yml | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) create mode 100644 .github/workflows/shellLint.yml diff --git a/.github/workflows/shellLint.yml b/.github/workflows/shellLint.yml new file mode 100644 index 0000000..ffa3018 --- /dev/null +++ b/.github/workflows/shellLint.yml @@ -0,0 +1,17 @@ +name: shellLint + +on: + push: + branches: [alpha,beta,master] + pull_request: + branches: [alpha,beta,master] + +jobs: + build: + runs-on: ubuntu-latest + steps: + - uses: actions/checkout@v2.3.4 + - name: Run ShellCheck + uses: azohra/shell-linter@latest + with: + path: "*.sh,*.lib" From 178442d5ae667f939d4db28fb2bb73cc56442e0f Mon Sep 17 00:00:00 2001 From: Nebz <28622481+NebzHB@users.noreply.github.com> Date: Tue, 27 Aug 2024 12:42:32 +0200 Subject: [PATCH 08/11] support "does not have a Release file." --- dependance.lib | 1 + 1 file changed, 1 insertion(+) diff --git a/dependance.lib b/dependance.lib index 91e9afc..1e9956b 100644 --- a/dependance.lib +++ b/dependance.lib @@ -515,4 +515,5 @@ fix_buster_backport_not_available() { fi } add_fix_handler "The repository 'http://[[:alnum:].-]\+\.debian\.org/debian buster-backports Release' no longer has a Release file." "" fix_buster_backport_not_available +add_fix_handler "The repository 'http://[[:alnum:].-]\+\.debian\.org/debian buster-backports Release' does not have a Release file." "" fix_buster_backport_not_available add_fix_handler "Le dépôt http://[[:alnum:].-]\+\.debian\.org/debian buster-backports Release ne contient plus de fichier Release." "" fix_buster_backport_not_available From a1ca23d3d01c1f36b4fea95955b9c51c9971de42 Mon Sep 17 00:00:00 2001 From: Nebz <28622481+NebzHB@users.noreply.github.com> Date: Tue, 27 Aug 2024 12:43:34 +0200 Subject: [PATCH 09/11] Update dependance.lib --- dependance.lib | 1 + 1 file changed, 1 insertion(+) diff --git a/dependance.lib b/dependance.lib index 1e9956b..7140e4d 100644 --- a/dependance.lib +++ b/dependance.lib @@ -502,6 +502,7 @@ add_fix_handler "Certificate verification failed: The certificate is NOT trusted # fix armbian.com not available for buster anymore (same fix than the Atlas plugin does) : add_fix_handler "The repository 'http://apt.armbian.com buster Release' no longer has a Release file." "" "sudo sed -i 's|^deb http://apt.armbian.com|#deb http://apt.armbian.com|g' /etc/apt/sources.list.d/armbian.list" +add_fix_handler "The repository 'http://apt.armbian.com buster Release' does not have a Release file." "" "sudo sed -i 's|^deb http://apt.armbian.com|#deb http://apt.armbian.com|g' /etc/apt/sources.list.d/armbian.list" add_fix_handler "Le dépôt http://apt.armbian.com buster Release ne contient plus de fichier Release." "" "sudo sed -i 's|^deb http://apt.armbian.com|#deb http://apt.armbian.com|g' /etc/apt/sources.list.d/armbian.list" # fix buster-backports not available anymore : From 05fbc17e1d2475a7f0215413c752b9e9d40680ff Mon Sep 17 00:00:00 2001 From: Nebz <28622481+NebzHB@users.noreply.github.com> Date: Tue, 27 Aug 2024 12:49:45 +0200 Subject: [PATCH 10/11] Update dependance.lib --- dependance.lib | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/dependance.lib b/dependance.lib index 7140e4d..a3376c8 100644 --- a/dependance.lib +++ b/dependance.lib @@ -515,6 +515,6 @@ fix_buster_backport_not_available() { sudo sed -i 's|^deb http://[a-zA-Z0-9.-]\+\.debian\.org/debian buster-backports|deb http://archive.debian.org/debian buster-backports|g' /etc/apt/sources.list fi } -add_fix_handler "The repository 'http://[[:alnum:].-]\+\.debian\.org/debian buster-backports Release' no longer has a Release file." "" fix_buster_backport_not_available -add_fix_handler "The repository 'http://[[:alnum:].-]\+\.debian\.org/debian buster-backports Release' does not have a Release file." "" fix_buster_backport_not_available -add_fix_handler "Le dépôt http://[[:alnum:].-]\+\.debian\.org/debian buster-backports Release ne contient plus de fichier Release." "" fix_buster_backport_not_available +add_fix_handler "The repository 'http://[[:alnum:].-]\+\.debian\.org/debian buster-backports Release' no longer has a Release file." "*The repository buster-backports no longer has a Release file." fix_buster_backport_not_available +add_fix_handler "The repository 'http://[[:alnum:].-]\+\.debian\.org/debian buster-backports Release' does not have a Release file." "*The repository buster-backports does not have a Release file." fix_buster_backport_not_available +add_fix_handler "Le dépôt http://[[:alnum:].-]\+\.debian\.org/debian buster-backports Release ne contient plus de fichier Release." "*Le dépôt buster-backports ne contient plus de fichier Release." fix_buster_backport_not_available From 657bd98385ea219a40fac1fb6b20b091c96b4248 Mon Sep 17 00:00:00 2001 From: Nebz <28622481+NebzHB@users.noreply.github.com> Date: Wed, 28 Aug 2024 11:30:02 +0200 Subject: [PATCH 11/11] Update shellLint.yml --- .github/workflows/shellLint.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/shellLint.yml b/.github/workflows/shellLint.yml index ffa3018..0b79d01 100644 --- a/.github/workflows/shellLint.yml +++ b/.github/workflows/shellLint.yml @@ -10,7 +10,7 @@ jobs: build: runs-on: ubuntu-latest steps: - - uses: actions/checkout@v2.3.4 + - uses: actions/checkout@v4 - name: Run ShellCheck uses: azohra/shell-linter@latest with: