diff --git a/lib/exec_in_chroot.sh b/lib/exec_in_chroot.sh index d34d7d1..b406c91 100755 --- a/lib/exec_in_chroot.sh +++ b/lib/exec_in_chroot.sh @@ -14,14 +14,14 @@ install_package_dependency(){ get_git_source(){ GIT_PATH=/tmp/${APP} [ ! "$1" == "" ] && GIT_PATH=$1 - [ -e ${GIT_PATH} ] && rm -fr ${GIT_PATH} + [ -e ${GIT_PATH} ] && rm -fr ${GIT_PATH} if [ "${GIT_VERSION}" = "last" ] ; then git clone --depth 1 ${DEPOT} ${GIT_PATH} else git clone --depth 1 -b ${GIT_VERSION} ${DEPOT} ${GIT_PATH} fi - [ "$1" != "noremovegit" ] && find ${GIT_PATH} -name .git -exec rm -fr {} \; +# [ "$1" != "noremovegit" ] && find ${GIT_PATH} -name .git -exec rm -fr {} \; } configure_depot_lgy(){ diff --git a/ressources/bitwarden-desktop/debmaker b/ressources/bitwarden-desktop/debmaker index 3cdb705..2c13d83 100755 --- a/ressources/bitwarden-desktop/debmaker +++ b/ressources/bitwarden-desktop/debmaker @@ -1,6 +1,6 @@ #!/bin/bash -VERSION=2025.3.0 +VERSION=2025.3.1 APP=bitwarden-desktop DEPOT=https://github.com/bitwarden/clients.git GIT_VERSION=desktop-v${VERSION} diff --git a/ressources/glpi/debmaker b/ressources/glpi/debmaker index a4829e3..7603e55 100755 --- a/ressources/glpi/debmaker +++ b/ressources/glpi/debmaker @@ -1,9 +1,9 @@ #!/bin/bash -VERSION=10.0.18 +VERSION=11.0.0 APP=glpi DEPOT=https://github.com/glpi-project/glpi.git -GIT_VERSION=${VERSION} +GIT_VERSION=last DEB_VERSION=${VERSION}-$(date +%Y%m%d%H%M) DEBIAN_VERSION_CODENAME=bookworm IMAGE_SIZE=4 diff --git a/ressources/joplin-desktop/debmaker b/ressources/joplin-desktop/debmaker index b6af66d..fe44590 100755 --- a/ressources/joplin-desktop/debmaker +++ b/ressources/joplin-desktop/debmaker @@ -1,6 +1,6 @@ #!/bin/bash -VERSION=3.2.13 +VERSION=3.3.4 APP=joplin-desktop GIT_VERSION=v${VERSION} DEB_VERSION=${VERSION}-$(date +%Y%m%d%H%M) @@ -9,7 +9,12 @@ DEBIAN_VERSION_CODENAME=bookworm IMAGE_SIZE=14 PACKAGE_DEPENDENCY="build-essential python-is-python3 nodejs rsync yarn" +clean(){ + rm -fr ~/.cache ~/.npm ~/.yarn +} + main(){ + clean base_package_upgrade configure_depot_yarn configure_depot_nodejs 20 @@ -20,7 +25,6 @@ main(){ } build() { -# rm -fr /tmp/${APP}/packages/app-mobile cd /tmp/${APP}/ BUILD_SEQUENCIAL=1 yarn install cd packages/app-desktop diff --git a/ressources/mautrix-whatsapp/debian/conffiles b/ressources/mautrix-whatsapp/debian/conffiles deleted file mode 100644 index 6dd2818..0000000 --- a/ressources/mautrix-whatsapp/debian/conffiles +++ /dev/null @@ -1 +0,0 @@ -/etc/mautrix-whatsapp/config.yaml diff --git a/ressources/mautrix-whatsapp/debian/postinst b/ressources/mautrix-whatsapp/debian/postinst index bbcb658..969cfb0 100755 --- a/ressources/mautrix-whatsapp/debian/postinst +++ b/ressources/mautrix-whatsapp/debian/postinst @@ -1,6 +1,9 @@ -#!/bin/bash +#!/bin/sh +set -e APP=mautrix-whatsapp id $APP &> /dev/null || useradd $APP -r -s /bin/false -md /var/lib/$APP/ chown -R $APP:$APP /var/lib/$APP/ chown -R $APP:$APP /etc/mautrix-whatsapp/ + +#DEBHELPER# diff --git a/ressources/mautrix-whatsapp/debian/rules b/ressources/mautrix-whatsapp/debian/rules index 7d1249a..c13185a 100755 --- a/ressources/mautrix-whatsapp/debian/rules +++ b/ressources/mautrix-whatsapp/debian/rules @@ -16,6 +16,7 @@ %: dh $@ + dh_installsystemd # dh_make generated override targets # This is example for Cmake (See https://bugs.debian.org/641051 ) diff --git a/ressources/mautrix-whatsapp/debmaker b/ressources/mautrix-whatsapp/debmaker index 2a54fcb..01da3c0 100755 --- a/ressources/mautrix-whatsapp/debmaker +++ b/ressources/mautrix-whatsapp/debmaker @@ -1,6 +1,6 @@ #!/bin/bash -VERSION=0.11.4 +VERSION=0.12.0 APP=mautrix-whatsapp DEPOT=https://github.com/mautrix/whatsapp.git GIT_VERSION=v${VERSION} diff --git a/ressources/vaultwarden-web/debmaker b/ressources/vaultwarden-web/debmaker index 1f6c135..9c7f7e2 100755 --- a/ressources/vaultwarden-web/debmaker +++ b/ressources/vaultwarden-web/debmaker @@ -1,10 +1,10 @@ #!/bin/bash -VERSION=2025.3.1 +VERSION=2025.4.0 APP=vaultwarden-web -BITWARDEN_VERSION=v2025.1.1 -GIT_VERSION=v2025.1.1 +BITWARDEN_VERSION=v$VERSION +GIT_VERSION=v$VERSION DEB_VERSION=$VERSION-$(date +%Y%m%d%H%M) DEBIAN_VERSION_CODENAME=bookworm IMAGE_SIZE=5