From f1fc3cb2e9a7a23b5ec15e8426eaa14336bd94fb Mon Sep 17 00:00:00 2001 From: thomas Date: Fri, 23 Dec 2022 01:04:28 +0100 Subject: [PATCH] update --- lib/function.sh | 4 ++++ ressources/adguardhome/debmaker | 2 +- ressources/authelia/debmaker | 2 +- ressources/bitwarden-desktop/debmaker | 2 +- ressources/budibase/debmaker | 2 +- ressources/element-web/debmaker | 4 ++-- ressources/gitea/debmaker | 2 +- ressources/joplin-desktop/debmaker | 2 +- ressources/joplin-server/debmaker | 2 +- ressources/kimai2/debmaker | 2 +- ressources/mautrix-whatsapp/debian/changelog | 6 ++++++ ressources/mautrix-whatsapp/debmaker | 2 +- ressources/tt-rss-plugin-wallabag/debmaker | 12 ++++++++---- .../tt-rss-plugin-wallabag/rootfs/DEBIAN/postinst | 2 -- ressources/tt-rss/debmaker | 13 ++++++++++--- 15 files changed, 39 insertions(+), 20 deletions(-) delete mode 100755 ressources/tt-rss-plugin-wallabag/rootfs/DEBIAN/postinst diff --git a/lib/function.sh b/lib/function.sh index 339d5f0..9580ec3 100644 --- a/lib/function.sh +++ b/lib/function.sh @@ -91,6 +91,10 @@ debmaker_run(){ [ -f cache/${APP} ] || zdebmaker_createAppOS zdebmaker_inject debmaker_mount_proc_sys cache/${APP} ${MOUNT_PATH}/${APP}/ + if [ -e ressources/${APP}/debian ] + then + echo VERSION is : $(head -n 1 ressources/${APP}/debian/changelog | grep -oE "[0-9.-]*") + fi if [ "$STEP" == "" ] then sudo chroot ${MOUNT_PATH}/${APP}/ /tmp/src/exec_in_chroot.sh main diff --git a/ressources/adguardhome/debmaker b/ressources/adguardhome/debmaker index 4e999a3..c815037 100755 --- a/ressources/adguardhome/debmaker +++ b/ressources/adguardhome/debmaker @@ -1,6 +1,6 @@ #!/bin/bash -VERSION=0.108.0-b.23 +VERSION=0.108.0-b.24 APP=adguardhome DEPOT=https://github.com/AdguardTeam/AdGuardHome.git GIT_VERSION=v${VERSION} diff --git a/ressources/authelia/debmaker b/ressources/authelia/debmaker index fed7216..a61d7b8 100755 --- a/ressources/authelia/debmaker +++ b/ressources/authelia/debmaker @@ -1,6 +1,6 @@ #!/bin/bash -VERSION=4.37.2 +VERSION=4.37.5 APP=authelia DEPOT=https://github.com/authelia/authelia.git GIT_VERSION=v${VERSION} diff --git a/ressources/bitwarden-desktop/debmaker b/ressources/bitwarden-desktop/debmaker index d9f0b45..786fd0b 100755 --- a/ressources/bitwarden-desktop/debmaker +++ b/ressources/bitwarden-desktop/debmaker @@ -1,6 +1,6 @@ #!/bin/bash -VERSION=2022.11.0 +VERSION=2022.12.0 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 fbfa4dd..6429d5b 100755 --- a/ressources/budibase/debmaker +++ b/ressources/budibase/debmaker @@ -1,6 +1,6 @@ #!/bin/bash -VERSION=2.1.39 +VERSION=2.2.6 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 bd29b94..172a4b1 100755 --- a/ressources/element-web/debmaker +++ b/ressources/element-web/debmaker @@ -1,6 +1,6 @@ #!/bin/bash -VERSION=1.11.16 +VERSION=1.11.17 APP=element-web DEPOT=https://github.com/vector-im/element-web.git GIT_VERSION=v${VERSION} @@ -31,7 +31,7 @@ build() { makedeb(){ PATH_DEB=/tmp/src/rootfs - + tar -zxf /tmp/${APP}/dist/element-${GIT_VERSION}*.tar.gz --strip-components=1 -C ${PATH_DEB}/usr/share/element-web/ cp /tmp/${APP}/config.sample.json ${PATH_DEB}/etc/element-web/config.json diff --git a/ressources/gitea/debmaker b/ressources/gitea/debmaker index 1c3adee..e04ef5c 100755 --- a/ressources/gitea/debmaker +++ b/ressources/gitea/debmaker @@ -1,6 +1,6 @@ #!/bin/bash -VERSION=1.17.3 +VERSION=1.17.4 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 9fba4af..1b3bb74 100755 --- a/ressources/joplin-desktop/debmaker +++ b/ressources/joplin-desktop/debmaker @@ -1,6 +1,6 @@ #!/bin/bash -VERSION=2.9.17 +VERSION=2.10.2 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 4ed2a5b..73ef054 100755 --- a/ressources/joplin-server/debmaker +++ b/ressources/joplin-server/debmaker @@ -1,6 +1,6 @@ #!/bin/bash -VERSION=2.9.7 +VERSION=2.10.4 APP=joplin-server GIT_VERSION=server-v${VERSION} DEB_VERSION=$VERSION-$(date +%Y%m%d%H%M) diff --git a/ressources/kimai2/debmaker b/ressources/kimai2/debmaker index e88d33a..d9679ec 100755 --- a/ressources/kimai2/debmaker +++ b/ressources/kimai2/debmaker @@ -1,6 +1,6 @@ #!/bin/bash -VERSION=1.29.1 +VERSION=1.30.0 APP=kimai2 DEPOT=https://github.com/kevinpapst/kimai2.git GIT_VERSION=${VERSION} diff --git a/ressources/mautrix-whatsapp/debian/changelog b/ressources/mautrix-whatsapp/debian/changelog index eb9c240..371f39e 100644 --- a/ressources/mautrix-whatsapp/debian/changelog +++ b/ressources/mautrix-whatsapp/debian/changelog @@ -1,3 +1,9 @@ +mautrix-whatsapp (0.8.0) UNRELEASED; urgency=medium + + * First deb version + + -- Thomas Legay Mon, 17 Sep 2022 21:08:37 +0200 + mautrix-whatsapp (0.7.2) UNRELEASED; urgency=medium * First deb version diff --git a/ressources/mautrix-whatsapp/debmaker b/ressources/mautrix-whatsapp/debmaker index 06aa2ff..41fe11b 100755 --- a/ressources/mautrix-whatsapp/debmaker +++ b/ressources/mautrix-whatsapp/debmaker @@ -1,6 +1,6 @@ #!/bin/bash -VERSION=0.7.2 +VERSION=0.8.0 APP=mautrix-whatsapp DEPOT=https://github.com/mautrix/whatsapp.git GIT_VERSION=v${VERSION} diff --git a/ressources/tt-rss-plugin-wallabag/debmaker b/ressources/tt-rss-plugin-wallabag/debmaker index 5d52e5c..23de4d5 100755 --- a/ressources/tt-rss-plugin-wallabag/debmaker +++ b/ressources/tt-rss-plugin-wallabag/debmaker @@ -1,7 +1,7 @@ #!/bin/bash APP=tt-rss-plugin-wallabag -VERSION=2.0.1 +VERSION=2.0.2 GIT_VERSION=$VERSION DEB_VERSION=$VERSION DEBIAN_VERSION_CODENAME=bullseye @@ -9,12 +9,16 @@ IMAGE_SIZE=1 #DEPOT=https://github.com/joshp23/ttrss-to-wallabag-v2.git DEPOT=https://github.com/tomamplius/ttrss-to-wallabag-v2 -STEP="base_package_upgrade get_git_source makedeb" +main(){ + base_package_upgrade + get_git_source + makedeb +} makedeb(){ PATH_DEB=/tmp/src/rootfs - mkdir -p ${PATH_DEB}/usr/share/tt-rss/plugins.local/ - cp -fr /tmp/${APP}/wallabag_v2 ${PATH_DEB}/usr/share/tt-rss/plugins.local/wallabag_v2 + mkdir -p ${PATH_DEB}/usr/share/tt-rss/plugins/ + cp -fr /tmp/${APP}/wallabag_v2 ${PATH_DEB}/usr/share/tt-rss/plugins/wallabag_v2 sed -i "s/%VERSION%/$DEB_VERSION/" ${PATH_DEB}/DEBIAN/control fakeroot dpkg-deb -Z gzip --build ${PATH_DEB} /tmp/dist diff --git a/ressources/tt-rss-plugin-wallabag/rootfs/DEBIAN/postinst b/ressources/tt-rss-plugin-wallabag/rootfs/DEBIAN/postinst deleted file mode 100755 index 3e20645..0000000 --- a/ressources/tt-rss-plugin-wallabag/rootfs/DEBIAN/postinst +++ /dev/null @@ -1,2 +0,0 @@ -#!/bin/bash -chown -R www-data:www-data /var/lib/tt-rss/ diff --git a/ressources/tt-rss/debmaker b/ressources/tt-rss/debmaker index 7877668..bed0bff 100755 --- a/ressources/tt-rss/debmaker +++ b/ressources/tt-rss/debmaker @@ -8,19 +8,26 @@ DEBIAN_VERSION_CODENAME=bullseye IMAGE_SIZE=1 DEPOT=https://git.tt-rss.org/fox/tt-rss.git -STEP="base_package_upgrade get_git_source makedeb" +main(){ + base_package_upgrade + get_git_source + makedeb +} makedeb(){ PATH_DEB=/tmp/src/rootfs cp -fr /tmp/${APP}/* ${PATH_DEB}/usr/share/tt-rss/ - - mv ${PATH_DEB}/usr/share/tt-rss/{cache,feed-icons,lock} ${PATH_DEB}/var/lib/tt-rss/ + + mv ${PATH_DEB}/usr/share/tt-rss/{cache,feed-icons,lock,plugins.local,templates.local,themes.local} ${PATH_DEB}/var/lib/tt-rss/ mv ${PATH_DEB}/usr/share/tt-rss/config.php-dist ${PATH_DEB}/etc/tt-rss/config.php ln -s /var/lib/tt-rss/cache ${PATH_DEB}/usr/share/tt-rss/cache ln -s /var/lib/tt-rss/feed-icons ${PATH_DEB}/usr/share/tt-rss/feed-icons ln -s /var/lib/tt-rss/lock ${PATH_DEB}/usr/share/tt-rss/lock + ln -s /var/lib/tt-rss/lock ${PATH_DEB}/usr/share/tt-rss/plugins.local + ln -s /var/lib/tt-rss/lock ${PATH_DEB}/usr/share/tt-rss/templates.local + ln -s /var/lib/tt-rss/lock ${PATH_DEB}/usr/share/tt-rss/themes.local ln -s /etc/tt-rss/config.php ${PATH_DEB}/usr/share/tt-rss/config.php