From dbef6baf09ce603344bdf370dda4c14187a3ff6a Mon Sep 17 00:00:00 2001 From: thomas Date: Thu, 30 Mar 2023 21:58:28 +0200 Subject: [PATCH] allow multi ressource in commande line update version --- debmaker | 88 ++++++++++++++++----------- lib/function.sh | 1 + ressources/adguardhome/debmaker | 2 +- ressources/bitwarden-desktop/debmaker | 2 +- ressources/budibase/debmaker | 2 +- ressources/element-web/debmaker | 2 +- ressources/gitea/debmaker | 2 +- ressources/joplin-desktop/debmaker | 2 +- ressources/joplin-server/debmaker | 4 +- ressources/kimai2/debmaker | 5 +- ressources/mautrix-whatsapp/debmaker | 9 ++- ressources/metabase/debmaker | 2 +- ressources/rss-bridge/debmaker | 2 +- ressources/rustdesk-server/debmaker | 3 +- ressources/vaultwarden/debmaker | 2 +- ressources/zigbee2mqtt/debmaker | 2 +- 16 files changed, 74 insertions(+), 56 deletions(-) diff --git a/debmaker b/debmaker index ff4f78f..b2c342a 100755 --- a/debmaker +++ b/debmaker @@ -1,39 +1,53 @@ #!/bin/bash source ./lib/function.sh -case $1 in -list) - ls ressources;; -run) - if [ -e ressources/$2/debmaker ] - then - . ressources/$2/debmaker - debmaker_run - else - echo no $2 project - fi - ;; -edit) - if [ -e ressources/$2/debmaker ] - then - nano ressources/$2/debmaker - else - echo no $2 project - fi - ;; -chroot) - if [ -e ressources/$2/debmaker ] - then - if [ -e cache/$2 ] - then - . ressources/$2/debmaker - debmaker_chroot - else - echo no cache file - fi - else - echo no $2 project - fi - ;; -*) - echo debmaker [list] [chroot app] [run ] [edit ];; -esac +ACTION=$1 +while [ ! -z $2 ] +do + shift + case $ACTION in + list) + ls ressources + exit + ;; + run) + if [ -e ressources/$1/debmaker ] + then + . ressources/$1/debmaker + debmaker_run + if [ $? -ne 0 ] + then + echo erreur lors de la génération + exit + fi + else + echo no $1 project + fi + ;; + edit) + if [ -e ressources/$1/debmaker ] + then + nano ressources/$1/debmaker + else + echo no $1 project + fi + ;; + chroot) + if [ -e ressources/$1/debmaker ] + then + if [ -e cache/$1 ] + then + . ressources/$1/debmaker + debmaker_chroot + else + echo no cache file + fi + else + echo no $1 project + fi + ;; + *) + echo "debmaker [list] [chroot app] [run ] [edit ]" + exit + ;; + esac +done diff --git a/lib/function.sh b/lib/function.sh index 9580ec3..8dc9f42 100644 --- a/lib/function.sh +++ b/lib/function.sh @@ -8,6 +8,7 @@ MOUNT_PATH=/mnt/debmaker zdebmaker_getDep(){ sudo sleep 0 + if [ $? -ne 0 ] ; then exit ; fi [ -d cache ] || mkdir cache [ -d dist ] || mkdir dist [ -d ${DEBOOTSTRAP_DIR} ] || debmaker_debootstrapUpdate diff --git a/ressources/adguardhome/debmaker b/ressources/adguardhome/debmaker index d616115..068a7b7 100755 --- a/ressources/adguardhome/debmaker +++ b/ressources/adguardhome/debmaker @@ -1,6 +1,6 @@ #!/bin/bash -VERSION=0.108.0-b.26 +VERSION=0.108.0-b.31 APP=adguardhome DEPOT=https://github.com/AdguardTeam/AdGuardHome.git GIT_VERSION=v${VERSION} diff --git a/ressources/bitwarden-desktop/debmaker b/ressources/bitwarden-desktop/debmaker index 421bddc..dc97468 100755 --- a/ressources/bitwarden-desktop/debmaker +++ b/ressources/bitwarden-desktop/debmaker @@ -1,6 +1,6 @@ #!/bin/bash -VERSION=2023.1.1 +VERSION=2023.3.1 APP=bitwarden-desktop DEPOT=https://github.com/bitwarden/clients.git GIT_VERSION=desktop-v${VERSION} diff --git a/ressources/budibase/debmaker b/ressources/budibase/debmaker index ff46866..b2dc05f 100755 --- a/ressources/budibase/debmaker +++ b/ressources/budibase/debmaker @@ -1,6 +1,6 @@ #!/bin/bash -VERSION=2.3.0 +VERSION=2.3.21 APP=budibase DEPOT=https://github.com/Budibase/budibase.git GIT_VERSION=v${VERSION} diff --git a/ressources/element-web/debmaker b/ressources/element-web/debmaker index 5e6b5e9..cf34710 100755 --- a/ressources/element-web/debmaker +++ b/ressources/element-web/debmaker @@ -1,6 +1,6 @@ #!/bin/bash -VERSION=1.11.22 +VERSION=1.11.26 APP=element-web DEPOT=https://github.com/vector-im/element-web.git GIT_VERSION=v${VERSION} diff --git a/ressources/gitea/debmaker b/ressources/gitea/debmaker index 237d348..df56990 100755 --- a/ressources/gitea/debmaker +++ b/ressources/gitea/debmaker @@ -1,6 +1,6 @@ #!/bin/bash -VERSION=1.18.3 +VERSION=1.19.0 APP=gitea DEPOT=https://github.com/go-gitea/gitea.git GIT_VERSION=v${VERSION} diff --git a/ressources/joplin-desktop/debmaker b/ressources/joplin-desktop/debmaker index cc70279..ef9fee2 100755 --- a/ressources/joplin-desktop/debmaker +++ b/ressources/joplin-desktop/debmaker @@ -1,6 +1,6 @@ #!/bin/bash -VERSION=2.10.5 +VERSION=2.11.1 APP=joplin-desktop GIT_VERSION=v${VERSION} DEB_VERSION=$VERSION-$(date +%Y%m%d%H%M) diff --git a/ressources/joplin-server/debmaker b/ressources/joplin-server/debmaker index 3215a47..1e8d66c 100755 --- a/ressources/joplin-server/debmaker +++ b/ressources/joplin-server/debmaker @@ -1,12 +1,12 @@ #!/bin/bash -VERSION=2.10.9 +VERSION=2.10.11 APP=joplin-server GIT_VERSION=server-v${VERSION} DEB_VERSION=$VERSION-$(date +%Y%m%d%H%M) DEPOT=https://github.com/laurent22/joplin.git DEBIAN_VERSION_CODENAME=bullseye -IMAGE_SIZE=10 +IMAGE_SIZE=12 STEP="base_package_upgrade envinit default_prebuild build makedeb" diff --git a/ressources/kimai2/debmaker b/ressources/kimai2/debmaker index dcd9542..bd26ef9 100755 --- a/ressources/kimai2/debmaker +++ b/ressources/kimai2/debmaker @@ -1,11 +1,12 @@ #!/bin/bash -VERSION=1.30.7 +VERSION=1.30.11 +VERSION=2.0.13 APP=kimai2 DEPOT=https://github.com/kevinpapst/kimai2.git GIT_VERSION=${VERSION} DEB_VERSION=${VERSION}-$(date +%Y%m%d%H%M) -DEBIAN_VERSION_CODENAME=bullseye +DEBIAN_VERSION_CODENAME=bookworm IMAGE_SIZE=2 PACKAGE_DEPENDENCY="composer php-zip php-gd php-intl php-xsl" diff --git a/ressources/mautrix-whatsapp/debmaker b/ressources/mautrix-whatsapp/debmaker index a3a172d..9b8398e 100755 --- a/ressources/mautrix-whatsapp/debmaker +++ b/ressources/mautrix-whatsapp/debmaker @@ -1,12 +1,12 @@ #!/bin/bash -VERSION=0.8.1 +VERSION=0.8.3 APP=mautrix-whatsapp DEPOT=https://github.com/mautrix/whatsapp.git GIT_VERSION=v${VERSION} DEBIAN_VERSION_CODENAME=bullseye IMAGE_SIZE=4 -PACKAGE_DEPENDENCY="debhelper-compat libolm-dev build-essential" +PACKAGE_DEPENDENCY="debhelper-compat libolm-dev build-essential devscripts" main(){ echo deb http://deb.debian.org/debian bullseye-backports main > /etc/apt/sources.list.d/backports.list @@ -19,7 +19,10 @@ main(){ makedeb(){ cd /tmp/${APP}/ + rm /tmp/*.deb cp -fr /tmp/src/debian /tmp/${APP} - dpkg-buildpackage -us -uc + export DEBEMAIL=thomas@lgy.fr + dch -v ${VERSION} + dpkg-buildpackage -us -uc cp /tmp/*.deb /tmp/dist } diff --git a/ressources/metabase/debmaker b/ressources/metabase/debmaker index 937f7f8..635d8a8 100755 --- a/ressources/metabase/debmaker +++ b/ressources/metabase/debmaker @@ -1,6 +1,6 @@ #!/bin/bash -VERSION=0.45.2.1 +VERSION=0.46.0 APP=metabase DEPOT=https://github.com/metabase/metabase.git GIT_VERSION=v$VERSION diff --git a/ressources/rss-bridge/debmaker b/ressources/rss-bridge/debmaker index 91caff0..978ee7f 100755 --- a/ressources/rss-bridge/debmaker +++ b/ressources/rss-bridge/debmaker @@ -1,6 +1,6 @@ #!/bin/bash -VERSION=2022-06-14 +VERSION=2023-03-22 APP=rss-bridge DEPOT=https://github.com/RSS-Bridge/rss-bridge.git GIT_VERSION=$VERSION diff --git a/ressources/rustdesk-server/debmaker b/ressources/rustdesk-server/debmaker index 120be86..96c2694 100755 --- a/ressources/rustdesk-server/debmaker +++ b/ressources/rustdesk-server/debmaker @@ -1,9 +1,8 @@ #!/bin/bash APP=rustdesk-server -VERSION=1.1.7-2 +VERSION=1.1.7-3 GIT_VERSION=$VERSION -GIT_VERSION=1.1.7 DEB_VERSION=$VERSION-$(date +%Y%m%d%H%M) DEBIAN_VERSION_CODENAME=bullseye IMAGE_SIZE=5 diff --git a/ressources/vaultwarden/debmaker b/ressources/vaultwarden/debmaker index 7edb5da..9f95e80 100755 --- a/ressources/vaultwarden/debmaker +++ b/ressources/vaultwarden/debmaker @@ -1,6 +1,6 @@ #!/bin/bash -VERSION=1.27.0 +VERSION=1.28.0 APP=vaultwarden GIT_VERSION=$VERSION DEB_VERSION=$VERSION-$(date +%Y%m%d%H%M) diff --git a/ressources/zigbee2mqtt/debmaker b/ressources/zigbee2mqtt/debmaker index ef52631..9e8054b 100755 --- a/ressources/zigbee2mqtt/debmaker +++ b/ressources/zigbee2mqtt/debmaker @@ -1,6 +1,6 @@ #!/bin/bash -VERSION=1.30.1 +VERSION=1.30.2 APP=zigbee2mqtt DEPOT=https://github.com/Koenkk/zigbee2mqtt.git GIT_VERSION=${VERSION}