From 9de0f839b63e1c1f2fb8627316010cf33171f95e Mon Sep 17 00:00:00 2001 From: thomas Date: Fri, 8 Apr 2022 09:09:18 +0200 Subject: [PATCH] Update version element-web metabase zigbee2mqtt --- ressources/element-web/debmaker | 4 ++-- ressources/metabase/debmaker | 2 +- ressources/zigbee2mqtt/debmaker | 31 ++++++++++++++++++++----------- 3 files changed, 23 insertions(+), 14 deletions(-) diff --git a/ressources/element-web/debmaker b/ressources/element-web/debmaker index b04dbfe..d0e5b83 100755 --- a/ressources/element-web/debmaker +++ b/ressources/element-web/debmaker @@ -1,7 +1,7 @@ #!/bin/bash -VERSION=1.10.7 -RELEASE=3 +VERSION=1.10.8 +RELEASE=1 [ -e ./lib/function.sh ] && source ./lib/function.sh diff --git a/ressources/metabase/debmaker b/ressources/metabase/debmaker index c8afa4c..8be7b0c 100755 --- a/ressources/metabase/debmaker +++ b/ressources/metabase/debmaker @@ -1,6 +1,6 @@ #!/bin/bash -VERSION=0.42.3 +VERSION=0.42.4 [ -e ./lib/function.sh ] && source ./lib/function.sh diff --git a/ressources/zigbee2mqtt/debmaker b/ressources/zigbee2mqtt/debmaker index a5945ef..d6eccd9 100755 --- a/ressources/zigbee2mqtt/debmaker +++ b/ressources/zigbee2mqtt/debmaker @@ -1,39 +1,48 @@ #!/bin/bash +VERSION=1.25.0 +RELEASE=1 + [ -e ./lib/function.sh ] && source ./lib/function.sh APP=zigbee2mqtt -VERSION=1.24.0 -GIT_VERSION=$VERSION -DEB_VERSION=$VERSION-3 +DEPOT=https://github.com/Koenkk/zigbee2mqtt.git +GIT_VERSION=${VERSION} +DEB_VERSION=${VERSION}-${RELEASE} DEBIAN_VERSION_CODENAME=bullseye -IMAGE_SIZE= +IMAGE_SIZE=2 STEP="envinit prebuild build makedeb" envinit() { - apt install -y --no-install-recommends wget ca-certificates nodejs npm git make g++ gcc fakeroot dpkg + if [ $(dpkg -l | grep -e 'ii nodejs' | wc -l) -eq 1 ]; + then + apt-get update + apt-get dist-upgrade -y + else + apt install -y --no-install-recommends wget ca-certificates nodejs npm git make g++ gcc fakeroot dpkg + fi } prebuild(){ - GIT_VERSION=$1 - git clone --depth 1 -b ${GIT_VERSION} https://github.com/Koenkk/zigbee2mqtt.git /tmp/zigbee2mqtt + [ -e /tmp/git ] && rm -fr /tmp/git + [ -e /tmp/${APP} ] || mkdir /tmp/${APP} + git clone --depth 1 -b ${GIT_VERSION} ${DEPOT} /tmp/git + cp -r /tmp/git/. /tmp/${APP} } build() { - cd /tmp/zigbee2mqtt/ + cd /tmp/${APP} npm ci npm run build } makedeb(){ - GIT_VERSION=$1 - DEB_VERSION=$2 PATH_DEB=/tmp/src/rootfs cp -fr /tmp/zigbee2mqtt/data/configuration.yaml ${PATH_DEB}/etc/zigbee2mqtt/configuration.yaml cp -fr /tmp/zigbee2mqtt/* ${PATH_DEB}/usr/lib/zigbee2mqtt/ - + sed -i "s/%VERSION%/$DEB_VERSION/" ${PATH_DEB}/DEBIAN/control fakeroot dpkg-deb -Z gzip --build ${PATH_DEB} /tmp/dist }