From 2024db6dc6c22e316ff44750971ea4437b646980 Mon Sep 17 00:00:00 2001 From: Thomas Legay Date: Sun, 16 Jul 2023 09:36:17 +0200 Subject: [PATCH] Update --- debmaker | 11 +++++++---- ressources/adguardhome/debmaker | 2 +- ressources/babybuddy/debmaker | 4 ++-- ressources/bitwarden-desktop/debmaker | 2 +- ressources/cloudbeaver/debmaker | 2 +- ressources/joplin-desktop/debmaker | 2 +- ressources/joplin-server/debmaker | 15 +++++++++------ ressources/metabase/debmaker | 4 ++-- ressources/roundcubemail/debmaker | 4 ++-- ressources/rss-bridge/debmaker | 6 +++--- ressources/rss-bridge/rootfs/DEBIAN/conffiles | 1 - ressources/tt-rss/debmaker | 2 +- 12 files changed, 30 insertions(+), 25 deletions(-) diff --git a/debmaker b/debmaker index b2c342a..4105a45 100755 --- a/debmaker +++ b/debmaker @@ -1,14 +1,17 @@ #!/bin/bash source ./lib/function.sh ACTION=$1 +case $ACTION in + list) + ls ressources + exit + ;; +esac + while [ ! -z $2 ] do shift case $ACTION in - list) - ls ressources - exit - ;; run) if [ -e ressources/$1/debmaker ] then diff --git a/ressources/adguardhome/debmaker b/ressources/adguardhome/debmaker index cd7fea0..499127a 100755 --- a/ressources/adguardhome/debmaker +++ b/ressources/adguardhome/debmaker @@ -1,6 +1,6 @@ #!/bin/bash -VERSION=0.108.0-b.40 +VERSION=0.108.0-b.41 APP=adguardhome DEPOT=https://github.com/AdguardTeam/AdGuardHome.git GIT_VERSION=v${VERSION} diff --git a/ressources/babybuddy/debmaker b/ressources/babybuddy/debmaker index a37d89c..1859735 100755 --- a/ressources/babybuddy/debmaker +++ b/ressources/babybuddy/debmaker @@ -1,11 +1,11 @@ #!/bin/bash -VERSION=1.16.0 +VERSION=2.0.1 APP=babybuddy DEPOT=https://github.com/babybuddy/babybuddy.git GIT_VERSION=v${VERSION} DEB_VERSION=${VERSION}-$(date +%Y%m%d%H%M) -DEBIAN_VERSION_CODENAME=bullseye +DEBIAN_VERSION_CODENAME=bookworm IMAGE_SIZE=6 PACKAGE_DEPENDENCY="" diff --git a/ressources/bitwarden-desktop/debmaker b/ressources/bitwarden-desktop/debmaker index b16480c..f4c4220 100755 --- a/ressources/bitwarden-desktop/debmaker +++ b/ressources/bitwarden-desktop/debmaker @@ -1,6 +1,6 @@ #!/bin/bash -VERSION=2023.5.0 +VERSION=2023.7.0 APP=bitwarden-desktop DEPOT=https://github.com/bitwarden/clients.git GIT_VERSION=desktop-v${VERSION} diff --git a/ressources/cloudbeaver/debmaker b/ressources/cloudbeaver/debmaker index f6b11e9..f766d91 100755 --- a/ressources/cloudbeaver/debmaker +++ b/ressources/cloudbeaver/debmaker @@ -7,7 +7,7 @@ GIT_VERSION=last DEB_VERSION=${VERSION}-$(date +%Y%m%d%H%M) DEBIAN_VERSION_CODENAME=bookworm IMAGE_SIZE=5 -PACKAGE_DEPENDENCY="nodejs yarn maven openjdk-11-jdk" +PACKAGE_DEPENDENCY="nodejs yarn maven default-jdk" main(){ base_package_upgrade diff --git a/ressources/joplin-desktop/debmaker b/ressources/joplin-desktop/debmaker index 7cd4637..6aefb83 100755 --- a/ressources/joplin-desktop/debmaker +++ b/ressources/joplin-desktop/debmaker @@ -1,6 +1,6 @@ #!/bin/bash -VERSION=2.12.4 +VERSION=2.12.7 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 c7c2cd5..45f0fc8 100755 --- a/ressources/joplin-server/debmaker +++ b/ressources/joplin-server/debmaker @@ -1,19 +1,22 @@ #!/bin/bash -VERSION=2.11.1 +VERSION=2.12.1 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 +DEBIAN_VERSION_CODENAME=bookworm IMAGE_SIZE=12 +PACKAGE_DEPENDENCY="build-essential python-is-python3 nodejs rsync yarn" -STEP="base_package_upgrade envinit default_prebuild build makedeb" - -envinit() { +main(){ + base_package_upgrade configure_depot_yarn configure_depot_nodejs - apt install -y --no-install-recommends build-essential python nodejs rsync yarn + install_package_dependency + get_git_source + build + makedeb } build() { diff --git a/ressources/metabase/debmaker b/ressources/metabase/debmaker index a7a8624..37b2329 100755 --- a/ressources/metabase/debmaker +++ b/ressources/metabase/debmaker @@ -1,11 +1,11 @@ #!/bin/bash -VERSION=0.46.4 +VERSION=0.46.6 APP=metabase DEPOT=https://github.com/metabase/metabase.git GIT_VERSION=v$VERSION DEB_VERSION=${VERSION}-$(date +%Y%m%d%H%M) -DEBIAN_VERSION_CODENAME=bullseye +DEBIAN_VERSION_CODENAME=bookworm IMAGE_SIZE=10 PACKAGE_DEPENDENCY="build-essential default-jdk curl nodejs yarn" diff --git a/ressources/roundcubemail/debmaker b/ressources/roundcubemail/debmaker index f6046e5..4f0d9eb 100755 --- a/ressources/roundcubemail/debmaker +++ b/ressources/roundcubemail/debmaker @@ -1,11 +1,11 @@ #!/bin/bash -VERSION=1.6.1 +VERSION=1.6.2 APP=roundcubemail DEPOT=https://github.com/roundcube/roundcubemail.git GIT_VERSION=${VERSION} DEB_VERSION=${VERSION}-$(date +%Y%m%d%H%M) -DEBIAN_VERSION_CODENAME=bullseye +DEBIAN_VERSION_CODENAME=bookworm IMAGE_SIZE=4 PACKAGE_DEPENDENCY="make curl npm nodejs jq php-xml php-pear php-mbstring unzip" diff --git a/ressources/rss-bridge/debmaker b/ressources/rss-bridge/debmaker index 978ee7f..c0b496f 100755 --- a/ressources/rss-bridge/debmaker +++ b/ressources/rss-bridge/debmaker @@ -1,6 +1,6 @@ #!/bin/bash -VERSION=2023-03-22 +VERSION=2023-07-13 APP=rss-bridge DEPOT=https://github.com/RSS-Bridge/rss-bridge.git GIT_VERSION=$VERSION @@ -16,10 +16,10 @@ makedeb(){ cp -fr /tmp/${APP} ${PATH_DEB}/usr/share/ cp ${PATH_DEB}/usr/share/rss-bridge/config.default.ini.php ${PATH_DEB}/etc/rss-bridge/config.ini.php - cp ${PATH_DEB}/usr/share/rss-bridge/whitelist.default.txt ${PATH_DEB}/etc/rss-bridge/whitelist.txt +# cp ${PATH_DEB}/usr/share/rss-bridge/whitelist.default.txt ${PATH_DEB}/etc/rss-bridge/whitelist.txt ln -s /etc/${APP}/config.ini.php ${PATH_DEB}/usr/share/rss-bridge/config.ini.php - ln -s /etc/${APP}/whitelist.txt ${PATH_DEB}/usr/share/rss-bridge/whitelist.txt +# ln -s /etc/${APP}/whitelist.txt ${PATH_DEB}/usr/share/rss-bridge/whitelist.txt mkdir -p ${PATH_DEB}/var/cache/rss-bridge/cache/ rm -r ${PATH_DEB}/usr/share/rss-bridge/cache diff --git a/ressources/rss-bridge/rootfs/DEBIAN/conffiles b/ressources/rss-bridge/rootfs/DEBIAN/conffiles index 001988f..5f549e1 100644 --- a/ressources/rss-bridge/rootfs/DEBIAN/conffiles +++ b/ressources/rss-bridge/rootfs/DEBIAN/conffiles @@ -1,2 +1 @@ /etc/rss-bridge/config.ini.php -/etc/rss-bridge/whitelist.txt diff --git a/ressources/tt-rss/debmaker b/ressources/tt-rss/debmaker index bed0bff..569af44 100755 --- a/ressources/tt-rss/debmaker +++ b/ressources/tt-rss/debmaker @@ -4,7 +4,7 @@ APP=tt-rss VERSION=$(date +%Y%m.%d.%H%M) GIT_VERSION=last DEB_VERSION=$VERSION -DEBIAN_VERSION_CODENAME=bullseye +DEBIAN_VERSION_CODENAME=bookworm IMAGE_SIZE=1 DEPOT=https://git.tt-rss.org/fox/tt-rss.git