From 23803bf8805513c2214d7aae5e3a7bfdbf467418 Mon Sep 17 00:00:00 2001
From: Thomas Legay <thomas@lgy.fr>
Date: Wed, 6 Sep 2023 00:44:21 +0200
Subject: [PATCH] update

---
 lib/exec_in_chroot.sh           | 16 ++++++----------
 ressources/zigbee2mqtt/debmaker |  6 +-----
 2 files changed, 7 insertions(+), 15 deletions(-)

diff --git a/lib/exec_in_chroot.sh b/lib/exec_in_chroot.sh
index 54b25b2..8997327 100755
--- a/lib/exec_in_chroot.sh
+++ b/lib/exec_in_chroot.sh
@@ -7,6 +7,7 @@ base_package_upgrade(){
 }
 
 install_package_dependency(){
+	apt update
 	apt-get install -y --no-install-recommends ${PACKAGE_DEPENDENCY}
 }
 
@@ -28,16 +29,11 @@ configure_depot_yarn() {
 }
 
 configure_depot_nodejs() {
-        NODE_VERSION=16
-        [ ! "$1" == "" ] && NODE_VERSION=$1
-        DEB_FILE=/etc/apt/sources.list.d/nodesource.list
-        XNODE_VERSION=${NODE_VERSION}.x
-        if [ -e ${DEB_FILE} ] && [ $(grep -c ${XNODE_VERSION} ${DEB_FILE}) -ne 0 ]
-        then
-                wget -qO - https://deb.nodesource.com/setup_${XNODE_VERSION} | bash
-        fi
-        wget -qO - https://deb.nodesource.com/setup_${XNODE_VERSION} | bash
-        echo -e "Package: nodejs\\nPin: version ${NODE_VERSION}.*\\nPin-Priority: 1000" > /etc/apt/preferences.d/nodejs
+	NODE_MAJOR=16
+	[ ! "$1" == "" ] && NODE_MAJOR=$1
+	echo "deb [signed-by=/etc/apt/keyrings/nodesource.gpg] https://deb.nodesource.com/node_$NODE_MAJOR.x nodistro main" > /etc/apt/sources.list.d/nodesource.list
+	wget -qO - https://deb.nodesource.com/gpgkey/nodesource-repo.gpg.key | gpg --dearmor -o /etc/apt/keyrings/nodesource.gpg
+	echo -e "Package: nodejs\\nPin: version $NODE_MAJOR.*\\nPin-Priority: 1000" > /etc/apt/preferences.d/nodejs
 }
 
 install_go() {
diff --git a/ressources/zigbee2mqtt/debmaker b/ressources/zigbee2mqtt/debmaker
index c9cac0a..c4409bc 100755
--- a/ressources/zigbee2mqtt/debmaker
+++ b/ressources/zigbee2mqtt/debmaker
@@ -1,10 +1,6 @@
 #!/bin/bash
 
-<<<<<<< HEAD
-VERSION=1.32.1
-=======
-VERSION=1.31.2
->>>>>>> parent of 0925d5a (Suivi de version)
+VERSION=1.33.0
 APP=zigbee2mqtt
 DEPOT=https://github.com/Koenkk/zigbee2mqtt.git
 GIT_VERSION=${VERSION}