Skip to content

Commit

Permalink
Merge branch 'NebzHB:master' into master
Browse files Browse the repository at this point in the history
  • Loading branch information
Mips2648 authored Aug 28, 2024
2 parents 822ce23 + 657bd98 commit 20ad569
Show file tree
Hide file tree
Showing 3 changed files with 34 additions and 3 deletions.
17 changes: 17 additions & 0 deletions .github/workflows/shellLint.yml
Original file line number Diff line number Diff line change
@@ -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@v4
- name: Run ShellCheck
uses: azohra/shell-linter@latest
with:
path: "*.sh,*.lib"
6 changes: 4 additions & 2 deletions dependance.lib
Original file line number Diff line number Diff line change
Expand Up @@ -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 :
Expand All @@ -514,5 +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 "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
14 changes: 13 additions & 1 deletion install_nodejs.sh
Original file line number Diff line number Diff line change
Expand Up @@ -85,7 +85,8 @@ fi

#end of support buster except smart
lsb_release -c | grep -q buster
if [ $? -eq 0 ]; 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
Expand All @@ -94,11 +95,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
Expand All @@ -122,6 +125,15 @@ if [ $? -eq 0 ]; then
fi
fi
fi
if [ $buster -eq 0 ] && [ "${noSupport:-false}" != false ]; then
if [ "$LANG_DEP" = "fr" ]; then
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
fi

#x86 32 bits not supported by nodesource anymore
bits=$(getconf LONG_BIT)
Expand Down

0 comments on commit 20ad569

Please sign in to comment.