diff --git a/lib/exec_in_chroot.sh b/lib/exec_in_chroot.sh index e1d8057..e7c46a8 100755 --- a/lib/exec_in_chroot.sh +++ b/lib/exec_in_chroot.sh @@ -51,7 +51,7 @@ install_rust() { bash /tmp/rustup -qy } -install_rust() { +install_clojure() { wget -qO - https://download.clojure.org/install/linux-install-1.11.1.1155.sh | bash } diff --git a/ressources/authelia/debmaker b/ressources/authelia/debmaker index 6cf3824..b43b15b 100755 --- a/ressources/authelia/debmaker +++ b/ressources/authelia/debmaker @@ -1,6 +1,6 @@ #!/bin/bash -VERSION=4.36.7 +VERSION=4.36.8 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 b8c99a0..bcd3f1d 100755 --- a/ressources/bitwarden-desktop/debmaker +++ b/ressources/bitwarden-desktop/debmaker @@ -1,19 +1,25 @@ #!/bin/bash -VERSION=2022.9.0 +VERSION=2022.9.1 APP=bitwarden-desktop DEPOT=https://github.com/bitwarden/clients.git GIT_VERSION=desktop-v${VERSION} DEB_VERSION=${VERSION}-$(date +%Y%m%d%H%M) DEBIAN_VERSION_CODENAME=bullseye IMAGE_SIZE=8 -PACKAGE_DEPENDENCY="pkg-config libsecret-1-dev yarn nodejs" +PACKAGE_DEPENDENCY="pkg-config libsecret-1-dev yarn nodejs build-essential libglib2.0-dev" -STEP="base_package_upgrade configure_depot_yarn configure_depot_nodejs install_package_dependency get_git_source build makedeb" +STEP="base_package_upgrade configure_depot_yarn configure_depot_nodejs install_package_dependency install_rust get_git_source build makedeb" build() { + source ~/.cargo/env + export PKG_CONFIG_ALL_STATIC=1 + export PKG_CONFIG_ALLOW_CROSS=1 + rustup target add x86_64-unknown-linux-musl cd /tmp/${APP} npm ci + cd /tmp/${APP}/apps/desktop/desktop_native/ + npm run build -- --target x86_64-unknown-linux-musl cd /tmp/${APP}/apps/desktop PATH=$PATH:/tmp/${APP}/node_modules/.bin/ npm run clean:dist @@ -21,6 +27,8 @@ build() { electron-builder --linux dir --x64 -p never } + + makedeb(){ PATH_DEB=/tmp/src/rootfs diff --git a/ressources/joplin-server/rootfs/etc/systemd/system/joplin-server.service b/ressources/joplin-server/rootfs/usr/lib/systemd/system/joplin-server.service similarity index 81% rename from ressources/joplin-server/rootfs/etc/systemd/system/joplin-server.service rename to ressources/joplin-server/rootfs/usr/lib/systemd/system/joplin-server.service index 10ee815..4f85e07 100644 --- a/ressources/joplin-server/rootfs/etc/systemd/system/joplin-server.service +++ b/ressources/joplin-server/rootfs/usr/lib/systemd/system/joplin-server.service @@ -8,7 +8,7 @@ After=network.target User=joplin-server Group=joplin-server EnvironmentFile=/etc/default/joplin-server -ExecStart=/usr/bin/yarn --cwd /usr/lib/joplin-server/server/ start +ExecStart=/usr/bin/yarn --cwd /usr/share/joplin-server/server/ start WorkingDirectory=/var/lib/joplin-server/ Restart=on-failure RestartSec=30s diff --git a/ressources/mautrix-whatsapp/debian/changelog b/ressources/mautrix-whatsapp/debian/changelog index f004ca7..9d0e6ad 100644 --- a/ressources/mautrix-whatsapp/debian/changelog +++ b/ressources/mautrix-whatsapp/debian/changelog @@ -1,3 +1,9 @@ +mautrix-whatsapp (0.7) UNRELEASED; urgency=medium + + * First deb version + + -- Thomas Legay Mon, 17 Sep 2022 21:08:37 +0200 + mautrix-whatsapp (0.6.1) UNRELEASED; urgency=medium * First deb version diff --git a/ressources/mautrix-whatsapp/debmaker b/ressources/mautrix-whatsapp/debmaker index a962422..c7d6720 100755 --- a/ressources/mautrix-whatsapp/debmaker +++ b/ressources/mautrix-whatsapp/debmaker @@ -1,6 +1,6 @@ #!/bin/bash -VERSION=0.6.1 +VERSION=0.7.0 APP=mautrix-whatsapp DEPOT=https://github.com/mautrix/whatsapp.git GIT_VERSION=v${VERSION} diff --git a/ressources/metabase/debmaker b/ressources/metabase/debmaker index c6213d4..c2ea4b1 100755 --- a/ressources/metabase/debmaker +++ b/ressources/metabase/debmaker @@ -1,20 +1,21 @@ #!/bin/bash -VERSION=0.44.2 +VERSION=0.44.3 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 IMAGE_SIZE=10 +PACKAGE_DEPENDENCY="build-essential openjdk-17-jdk curl nodejs yarn" STEP="base_package_upgrade envinit get_git_source build makedeb" envinit() { configure_depot_yarn configure_depot_nodejs - apt install -y --no-install-recommends build-essential openjdk-17-jdk curl nodejs yarn - wget -qO - https://download.clojure.org/install/linux-install-1.11.1.1155.sh | bash + install_package_dependency + install_clojure } build() { diff --git a/ressources/rustdesk-server/debmaker b/ressources/rustdesk-server/debmaker index 847ae29..4edf68f 100755 --- a/ressources/rustdesk-server/debmaker +++ b/ressources/rustdesk-server/debmaker @@ -1,7 +1,7 @@ #!/bin/bash APP=rustdesk-server -VERSION=1.1.5-1 +VERSION=1.1.6-1 GIT_VERSION=$VERSION DEB_VERSION=$VERSION-$(date +%Y%m%d%H%M) DEBIAN_VERSION_CODENAME=bullseye