update versions

debmaker

@@ -1,4 +1,5 @@
 #!/bin/bash
+source ./lib/function.sh
 case $1 in
 list)
   ls ressources;;

lib/exec_in_chroot.sh

@@ -1,13 +1,23 @@
 #!/bin/bash
 
-minimum_package() {
+base_package_upgrade(){
 	apt update
-	apt install -y git wget ca-certificates dpkg fakeroot gnupg
+	apt dist-upgrade -y
+	apt install -y git wget ca-certificates dpkg fakeroot gnupg2
 }
 
-default_prebuild(){
+install_package_dependency(){
+	apt-get install -y --no-install-recommends ${PACKAGE_DEPENDENCY}
+}
+
+get_git_source(){
         [ -e /tmp/${APP} ] && rm -fr /tmp/${APP}
+		if [ "${GIT_VERSION}" = "last" ] ;
+		then
+			git clone --depth 1 ${DEPOT}  /tmp/${APP}
+		else
 			git clone --depth 1 -b ${GIT_VERSION} ${DEPOT}  /tmp/${APP}
+		fi
 }
 
 configure_depot_yarn() {
@@ -41,10 +51,23 @@ install_rust() {
 	bash /tmp/rustup -qy
 }
 
+install_rust() {
+	wget -qO - https://download.clojure.org/install/linux-install-1.11.1.1155.sh | bash
+}
+
+
+minimum_package() {
+	base_package_upgrade
+}
+
+default_prebuild(){
+	get_git_source
+}
+
+source /tmp/src/debmaker
 
 if [ ! "$1" == "" ];
 then
-	source /tmp/src/debmaker
 	FUNC=$1
 	shift
 	${FUNC} $*

ressources/adguardhome/debmaker

@@ -1,30 +1,15 @@
 #!/bin/bash
 
-VERSION=0.108.0-b.11
+VERSION=0.108.0-b.14
-
-[ -e ./lib/function.sh ] && source ./lib/function.sh
-
 APP=adguardhome
 DEPOT=https://github.com/AdguardTeam/AdGuardHome.git
 GIT_VERSION=v${VERSION}
 DEB_VERSION=${VERSION}-$(date +%Y%m%d%H%M)
 DEBIAN_VERSION_CODENAME=bullseye
 IMAGE_SIZE=4
-STEP="envinit prebuild build makedeb"
+PACKAGE_DEPENDENCY="build-essential nodejs yarn"
 
-envinit() {
+STEP="base_package_upgrade configure_depot_yarn configure_depot_nodejs install_package_dependency install_go get_git_source build makedeb"
-	configure_depot_yarn
-	configure_depot_nodejs
-	apt-get update
-	apt-get dist-upgrade -y
-	apt install -y --no-install-recommends build-essential git wget ca-certificates dpkg fakeroot nodejs yarn
-	install_go
-}
-
-prebuild(){
-	[ -e /tmp/${APP} ] && rm -fr /tmp/${APP}
-	git clone --depth 1 -b ${GIT_VERSION} ${DEPOT} /tmp/${APP}
-}
 
 build() {
 	cd /tmp/${APP}

ressources/authelia/debmaker

@@ -1,9 +1,6 @@
 #!/bin/bash
 
-VERSION=4.36.4
+VERSION=4.36.7
-
-[ -e ./lib/function.sh ] && source ./lib/function.sh
-
 APP=authelia
 DEPOT=https://github.com/authelia/authelia.git
 GIT_VERSION=v${VERSION}
@@ -11,12 +8,10 @@ DEB_VERSION=${VERSION}-$(date +%Y%m%d%H%M)
 DEBIAN_VERSION_CODENAME=bullseye
 IMAGE_SIZE=6
 
-STEP="minimum_package envinit default_prebuild build makedeb"
+STEP="base_package_upgrade envinit get_git_source build makedeb"
 
 envinit() {
 	configure_depot_nodejs
-	apt-get update
-	apt-get dist-upgrade -y
 	apt install -y --no-install-recommends build-essential nodejs
 	install_go
 	wget -qO - https://get.pnpm.io/install.sh | sh -

ressources/bitwarden-desktop/debmaker

@@ -1,25 +1,15 @@
 #!/bin/bash
 
 VERSION=2022.8.1
-
-[ -e ./lib/function.sh ] && source ./lib/function.sh
-
 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=10
+PACKAGE_DEPENDENCY="pkg-config libsecret-1-dev yarn nodejs"
 
-STEP="minimum_package envinit default_prebuild build makedeb"
+STEP="base_package_upgrade configure_depot_yarn configure_depot_nodejs install_package_dependency get_git_source build makedeb"
-
-envinit() {
-	configure_depot_yarn
-	configure_depot_nodejs
-	apt-get update
-	apt-get dist-upgrade -y
-	apt install -y --no-install-recommends build-essential pkg-config libsecret-1-dev yarn nodejs
-}
 
 build() {
 	cd /tmp/${APP}

ressources/element-web/debmaker

@@ -1,9 +1,6 @@
 #!/bin/bash
 
-VERSION=1.11.2
+VERSION=1.11.4
-
-[ -e ./lib/function.sh ] && source ./lib/function.sh
-
 APP=element-web
 DEPOT=https://github.com/vector-im/element-web.git
 GIT_VERSION=v${VERSION}
@@ -11,22 +8,14 @@ DEB_VERSION=${VERSION}-$(date +%Y%m%d%H%M)
 DEBIAN_VERSION_CODENAME=bullseye
 IMAGE_SIZE=4
 
-STEP="envinit prebuild build makedeb"
+STEP="base_package_upgrade envinit get_git_source build makedeb"
 
 envinit() {
-	minimum_package
 	configure_depot_yarn
 	configure_depot_nodejs
-	apt-get update
-	apt-get dist-upgrade -y
 	apt install -y --no-install-recommends yarn nodejs
 }
 
-prebuild(){
-	[ -e /tmp/${APP} ] && rm -fr /tmp/${APP}
-	git clone --depth 1 -b ${GIT_VERSION} ${DEPOT}  /tmp/${APP}
-}
-
 build() {
 	cd /tmp/${APP}
 	yarn install

ressources/flame/debmaker

@@ -1,34 +1,15 @@
 #!/bin/bash
 
 VERSION=2.3.0
-
-[ -e ./lib/function.sh ] && source ./lib/function.sh
-
 APP=flame
 DEPOT=https://github.com/pawelmalak/flame.git
 GIT_VERSION=v${VERSION}
 DEB_VERSION=${VERSION}-$(date +%Y%m%d%H%M)
 DEBIAN_VERSION_CODENAME=bullseye
 IMAGE_SIZE=3
+PACKAGE_DEPENDENCY="build-essential nodejs npm"
 
-STEP="envinit prebuild build makedeb"
+STEP="base_package_upgrade install_package_dependency get_git_source build makedeb"
-
-envinit() {
-	apt-get update
-	if [ $(dpkg -l | grep -e 'ii  nodejs ' | wc -l) -eq 1 ];
-	then 
-		apt-get dist-upgrade -y
-	else
-		apt install -y --no-install-recommends  git wget ca-certificates dpkg fakeroot build-essential nodejs npm
-	fi
-}
-
-prebuild(){
-	[ -e /tmp/git ] && rm -fr /tmp/git
-	[ -e /tmp/${APP} ] || mkdir /tmp/${APP}
-	git clone --depth 1 -b ${GIT_VERSION} ${DEPOT}  /tmp/git
-	cp -r /tmp/git/. /tmp/${APP}
-}
 
 build() {
 	cd /tmp/${APP}/

ressources/gitea/debmaker

@@ -1,9 +1,6 @@
 #!/bin/bash
 
-VERSION=1.17.0
+VERSION=1.17.2
-
-[ -e ./lib/function.sh ] && source ./lib/function.sh
-
 APP=gitea
 DEPOT=https://github.com/go-gitea/gitea.git
 GIT_VERSION=v${VERSION}
@@ -11,13 +8,10 @@ DEB_VERSION=${VERSION}-$(date +%Y%m%d%H%M)
 DEBIAN_VERSION_CODENAME=bullseye
 IMAGE_SIZE=5
 
-STEP="envinit default_prebuild build makedeb"
+STEP="base_package_upgrade envinit default_prebuild build makedeb"
 
 envinit() {
-	minimum_package
 	configure_depot_nodejs
-	apt-get update
-	apt-get dist-upgrade -y
 	apt install -y --no-install-recommends build-essential nodejs
 	install_go
 }

ressources/glpi/debmaker

@@ -1,9 +1,6 @@
 #!/bin/bash
 
 VERSION=10.0.2
-
-[ -e ./lib/function.sh ] && source ./lib/function.sh
-
 APP=glpi
 DEPOT=https://github.com/glpi-project/glpi.git
 GIT_VERSION=${VERSION}
@@ -11,25 +8,11 @@ DEB_VERSION=${VERSION}-$(date +%Y%m%d%H%M)
 DEBIAN_VERSION_CODENAME=bullseye
 IMAGE_SIZE=4
 
-STEP="envinit prebuild build makedeb"
+STEP="base_package_upgrade envinit get_git_source build makedeb"
 
 envinit() {
-	apt-get update
+	configure_depot_nodejs
-	if [ $(dpkg -l | grep -e 'ii  composer ' | wc -l) -eq 1 ];
+	apt install -y --no-install-recommends patch composer php-json php-xml php-curl php-gd php-intl php-ldap php-zip php-mysql gettext
-	then 
-		apt-get dist-upgrade -y
-	else
-		apt install -y --no-install-recommends git fakeroot dpkg patch composer php-json php-xml php-curl php-gd php-intl php-ldap php-zip php-mysql wget gettext
-		wget -qO - https://deb.nodesource.com/setup_16.x | bash
-		apt install nodejs
-	fi
-}
-
-prebuild(){
-	[ -e /tmp/git ] && rm -fr /tmp/git
-	[ -e /tmp/${APP} ] || mkdir /tmp/${APP}
-	git clone --depth 1 -b ${GIT_VERSION} ${DEPOT}  /tmp/git
-	cp -fr /tmp/git/. /tmp/${APP}
 }
 
 build(){

ressources/gotify/debmaker

@@ -1,30 +1,21 @@
 #!/bin/bash
 
-[ -e ./lib/function.sh ] && source ./lib/function.sh
-
 APP=gotify
-VERSION=2.1.5
+VERSION=2.1.6
 GIT_VERSION=v$VERSION
 DEB_VERSION=$VERSION-$(date +%Y%m%d%H%M)
 DEBIAN_VERSION_CODENAME=bullseye
 IMAGE_SIZE=6
+DEPOT=https://github.com/gotify/server.git
+PACKAGE_DEPENDENCY="build-essential nodejs yarn"
 
-STEP="envinit prebuild build makedeb"
+STEP="base_package_upgrade envinit get_git_source build makedeb"
 
 envinit() {
-	apt-get update
+	configure_depot_yarn
-	apt install -y --no-install-recommends build-essential git wget ca-certificates dpkg fakeroot gnupg2
+	configure_depot_nodejs
-	wget -qO - https://deb.nodesource.com/setup_16.x | bash
+	install_package_dependency
-	wget -qO - https://dl.yarnpkg.com/debian/pubkey.gpg | gpg --dearmor  > /usr/share/keyrings/yarnkey.gpg
+	install_go
-	echo "deb [signed-by=/usr/share/keyrings/yarnkey.gpg] https://dl.yarnpkg.com/debian stable main" > /etc/apt/sources.list.d/yarn.list
-	apt-get update
-	apt-get install -y nodejs yarn
-	wget -qO - https://go.dev/dl/go1.18.1.linux-amd64.tar.gz | tar -C /usr/local -xz
-}
-
-prebuild(){
-	[ -e /tmp/${APP} ] && rm -fr /tmp/${APP}
-	git clone --depth 1 -b ${GIT_VERSION} https://github.com/gotify/server.git /tmp/${APP}
 }
 
 build() {
@@ -42,6 +33,7 @@ makedeb(){
 	PATH_DEB=/tmp/src/rootfs
 
 	cp /tmp/${APP}/gotify-server ${PATH_DEB}/usr/bin/
+	chmod +x ${PATH_DEB}/usr/bin/gotify-server
 	cp /tmp/${APP}/config.example.yml ${PATH_DEB}/etc/gotify/config.yml
 	sed -i "s/%VERSION%/$DEB_VERSION/" ${PATH_DEB}/DEBIAN/control
 	fakeroot dpkg-deb -Z gzip --build ${PATH_DEB} /tmp/dist

ressources/gotify/rootfs/usr/lib/systemd/system/gotify.service

@@ -7,7 +7,7 @@ After=network.target
 User=gotify
 Group=gotify
 ExecStart=/usr/bin/gotify-server
-WorkingDirectory=/var/lib/gotify-server
+WorkingDirectory=/var/lib/gotify
 
 [Install]
 WantedBy=multi-user.target

ressources/grocy/debmaker

@@ -1,9 +1,6 @@
 #!/bin/bash
 
 VERSION=3.3.1
-
-[ -e ./lib/function.sh ] && source ./lib/function.sh
-
 APP=grocy
 DEPOT=https://github.com/grocy/grocy.git
 GIT_VERSION=v$VERSION
@@ -11,27 +8,11 @@ DEB_VERSION=${VERSION}-$(date +%Y%m%d%H%M)
 DEBIAN_VERSION_CODENAME=sid
 IMAGE_SIZE=4
 
-STEP="envinit prebuild build makedeb"
+STEP="base_package_upgrade envinit get_git_source build makedeb"
 
 envinit() {
-	apt-get update
+	configure_depot_yarn
-		if [ $(dpkg -l | grep -e 'ii  php-simplexml ' | wc -l) -eq 1 ];
+	apt-get install -y --no-install-recommends composer php-simplexml php-gd unzip yarn
-	then
-		apt-get dist-upgrade -y
-	else
-		apt-get install -y --no-install-recommends wget ca-certificates gnupg2 composer git php-simplexml php-gd fakeroot dpkg unzip
-		wget -qO - https://dl.yarnpkg.com/debian/pubkey.gpg | gpg --dearmor  > /usr/share/keyrings/yarnkey.gpg
-		echo "deb [signed-by=/usr/share/keyrings/yarnkey.gpg] https://dl.yarnpkg.com/debian stable main" > /etc/apt/sources.list.d/yarn.list
-		apt-get update
-		apt-get install -y yarn 
-	fi
-}
-
-prebuild(){
-	[ -e /tmp/git ] && rm -fr /tmp/git
-	[ -e /tmp/${APP} ] || mkdir /tmp/${APP}
-	git clone --depth 1 -b ${GIT_VERSION} ${DEPOT}  /tmp/git
-	cp -r /tmp/git/. /tmp/${APP}
 }
 
 build() {

ressources/joplin-desktop/debmaker

@@ -1,9 +1,6 @@
 #!/bin/bash
 
-VERSION=2.9.2
+VERSION=2.9.4
-
-[ -e ./lib/function.sh ] && source ./lib/function.sh
-
 APP=joplin-desktop
 GIT_VERSION=v${VERSION}
 DEB_VERSION=$VERSION-$(date +%Y%m%d%H%M)
@@ -11,13 +8,11 @@ DEPOT=https://github.com/laurent22/joplin.git
 DEBIAN_VERSION_CODENAME=bullseye
 IMAGE_SIZE=10
 
-STEP="minimum_package envinit default_prebuild build makedeb"
+STEP="base_package_upgrade envinit get_git_source build makedeb"
 
 envinit() {
 	configure_depot_yarn
 	configure_depot_nodejs
-	apt-get update
-	apt-get dist-upgrade -y
 	apt install -y --no-install-recommends build-essential python nodejs rsync yarn
 }
 

ressources/joplin-server/debmaker

@@ -1,9 +1,6 @@
 #!/bin/bash
 
 VERSION=2.7.4
-
-[ -e ./lib/function.sh ] && source ./lib/function.sh
-
 APP=joplin-server
 GIT_VERSION=server-v${VERSION}
 DEB_VERSION=$VERSION-$(date +%Y%m%d%H%M)
@@ -11,13 +8,11 @@ DEPOT=https://github.com/laurent22/joplin.git
 DEBIAN_VERSION_CODENAME=bullseye
 IMAGE_SIZE=8
 
-STEP="minimum_package envinit default_prebuild build makedeb"
+STEP="base_package_upgrade envinit default_prebuild build makedeb"
 
 envinit() {
 	configure_depot_yarn
 	configure_depot_nodejs
-	apt-get update
-	apt-get dist-upgrade -y
 	apt install -y --no-install-recommends build-essential python nodejs rsync yarn
 }
 

ressources/libretranslate/debmaker

@@ -3,8 +3,6 @@
 VERSION=1.2.7 
 RELEASE=1
 
-[ -e ./lib/function.sh ] && source ./lib/function.sh
-
 APP=libretranslate
 DEPOT=https://github.com/LibreTranslate/LibreTranslate.git
 GIT_VERSION=v${VERSION}

ressources/mailhog/debmaker

@@ -1,9 +1,6 @@
 #!/bin/bash
 
 VERSION=1.1.0
-
-[ -e ./lib/function.sh ] && source ./lib/function.sh
-
 APP=mailhog
 DEPOT=https://github.com/mailhog/MailHog.git
 GIT_VERSION=v$VERSION-beta1
@@ -11,18 +8,11 @@ DEB_VERSION=$VERSION-$(date +%Y%m%d%H%M)
 DEBIAN_VERSION_CODENAME=bullseye
 IMAGE_SIZE=2
 
-STEP="envinit prebuild build makedeb"
+STEP="base_package_upgrade envinit base_package_upgrade build makedeb"
 
 envinit() {
-	apt-get update
+	apt install -y --no-install-recommends build-essential
-	apt-get dist-upgrade -y
+	install_go
-	apt install -y --no-install-recommends build-essential git wget ca-certificates dpkg fakeroot 
-	wget -qO - https://go.dev/dl/go1.18.linux-amd64.tar.gz | tar -C /usr/local -xz
-}
-
-prebuild(){
-	[ -e /tmp/${APP} ] && rm -fr /tmp/${APP}
-	git clone --depth 1 -b ${GIT_VERSION} ${DEPOT} /tmp/${APP}
 }
 
 build() {

ressources/mautrix-syncproxy/debmaker

@@ -1,28 +1,22 @@
 #!/bin/bash
 
-[ -e ./lib/function.sh ] && source ./lib/function.sh
-
 APP=mautrix-syncproxy
-VERSION=0.0.1
+VERSION=last
 GIT_VERSION=$VERSION
-DEB_VERSION=$VERSION-1
+DEB_VERSION=0.1-$(date +%Y%m%d%H%M)
 DEBIAN_VERSION_CODENAME=bullseye
 IMAGE_SIZE=2
+DEPOT=https://github.com/mautrix/syncproxy.git
 
-STEP="envinit prebuild build makedeb"
+STEP="base_package_upgrade envinit get_git_source build makedeb"
 
 envinit() {
-	apt install -y --no-install-recommends build-essential git wget ca-certificates dpkg fakeroot
+	apt install -y --no-install-recommends build-essential
-	wget -qO - https://go.dev/dl/go1.17.7.linux-amd64.tar.gz | tar -C /usr/local -xz
+	install_go
-}
-
-prebuild(){
-	GIT_VERSION=$1
-	git clone --depth 1 https://github.com/mautrix/syncproxy.git /tmp/mautrix-syncproxy
 }
 
 build() {
-	cd /tmp/mautrix-syncproxy/
+	cd /tmp/${APP}
 	PATH=$PATH:/usr/local/go/bin
 	go build -o mautrix-syncproxy
 }

ressources/mautrix-whatsapp/debian/changelog

@@ -1,3 +1,9 @@
+mautrix-whatsapp (0.6.1) UNRELEASED; urgency=medium
+
+  * First deb version
+
+ -- Thomas Legay <thomas@lgy.fr>  Mon, 17 Jul 2022 21:08:37 +0200
+
 mautrix-whatsapp (0.6.0) UNRELEASED; urgency=medium
 
   * First deb version

ressources/mautrix-whatsapp/debmaker

@@ -1,9 +1,6 @@
 #!/bin/bash
 
-VERSION=0.6.0
+VERSION=0.6.1
-
-[ -e ./lib/function.sh ] && source ./lib/function.sh
-
 APP=mautrix-whatsapp
 DEPOT=https://github.com/mautrix/whatsapp.git
 GIT_VERSION=v${VERSION}

ressources/mautrix-wsproxy/debmaker

@@ -1,39 +1,32 @@
 #!/bin/bash
 
-[ -e ./lib/function.sh ] && source ./lib/function.sh
-
 APP=mautrix-wsproxy
 VERSION=1.0.0
-GIT_VERSION=$VERSION
+GIT_VERSION=last
-DEB_VERSION=$VERSION-1
+DEB_VERSION=$VERSION-$(date +%Y%m%d%H%M)
 DEBIAN_VERSION_CODENAME=bullseye
 IMAGE_SIZE=2
+DEPOT=https://github.com/mautrix/wsproxy.git
 
-STEP="envinit prebuild build makedeb"
+STEP="base_package_upgrade envinit get_git_source build makedeb"
 
 envinit() {
-	apt install -y --no-install-recommends build-essential git wget ca-certificates dpkg fakeroot
+	apt install -y --no-install-recommends build-essential
-	wget -qO - https://go.dev/dl/go1.17.7.linux-amd64.tar.gz | tar -C /usr/local -xz
+	install_go
-}
-
-prebuild(){
-	GIT_VERSION=$1
-	git clone --depth 1 https://github.com/mautrix/wsproxy.git /tmp/mautrix-wsproxy
 }
 
 build() {
-	cd /tmp/mautrix-wsproxy/
+	cd /tmp/${APP}
 	PATH=$PATH:/usr/local/go/bin
 	go build -o mautrix-wsproxy
 }
 
 makedeb(){
-	GIT_VERSION=$1
-	DEB_VERSION=$2
 	PATH_DEB=/tmp/src/rootfs
 
-	cp /tmp/mautrix-wsproxy/mautrix-wsproxy ${PATH_DEB}/usr/bin/mautrix-wsproxy
+	cp /tmp/${APP}/mautrix-wsproxy ${PATH_DEB}/usr/bin/mautrix-wsproxy
-	cp /tmp/mautrix-wsproxy/example-config.yaml ${PATH_DEB}/etc/mautrix-wsproxy.yaml
+	cp /tmp/${APP}/example-config.yaml ${PATH_DEB}/etc/mautrix-wsproxy.yaml
+	
 	sed -i "s/%VERSION%/$DEB_VERSION/" ${PATH_DEB}/DEBIAN/control
 	fakeroot dpkg-deb -Z gzip --build ${PATH_DEB} /tmp/dist
 }

ressources/metabase/debmaker

@@ -1,9 +1,6 @@
 #!/bin/bash
 
-VERSION=0.44
+VERSION=0.44.2
-
-[ -e ./lib/function.sh ] && source ./lib/function.sh
-
 APP=metabase
 DEPOT=https://github.com/metabase/metabase.git
 GIT_VERSION=v$VERSION
@@ -11,25 +8,13 @@ DEB_VERSION=${VERSION}-$(date +%Y%m%d%H%M)
 DEBIAN_VERSION_CODENAME=bullseye
 IMAGE_SIZE=10
 
-STEP="envinit prebuild build makedeb"
+STEP="base_package_upgrade envinit get_git_source build makedeb"
 
 envinit() {
-	apt-get update
+	configure_depot_yarn
-	apt-get dist-upgrade -y
+	configure_depot_nodejs
-	apt install -y --no-install-recommends build-essential git wget ca-certificates dpkg fakeroot openjdk-17-jdk curl
+	apt install -y --no-install-recommends build-essential openjdk-17-jdk curl nodejs yarn
-	wget -qO - https://deb.nodesource.com/setup_16.x | bash
+        wget -qO - https://download.clojure.org/install/linux-install-1.11.1.1155.sh | bash
-	wget -qO - https://dl.yarnpkg.com/debian/pubkey.gpg | gpg --dearmor  > /usr/share/keyrings/yarnkey.gpg
-	echo "deb [signed-by=/usr/share/keyrings/yarnkey.gpg] https://dl.yarnpkg.com/debian stable main" > /etc/apt/sources.list.d/yarn.list
-	apt-get update
-	apt-get install -y nodejs yarn
-	curl https://download.clojure.org/install/linux-install-1.11.1.1149.sh | bash
-}
-
-prebuild(){
-	[ -e /tmp/git ] && rm -fr /tmp/git
-	[ -e /tmp/${APP} ] || mkdir /tmp/${APP}
-	git clone --depth 1 -b ${GIT_VERSION} ${DEPOT}  /tmp/git
-	cp -r /tmp/git/. /tmp/${APP}
 }
 
 build() {

ressources/roundcubemail/debmaker

@@ -1,23 +1,15 @@
 #!/bin/bash
 
 VERSION=1.6.0
-
-[ -e ./lib/function.sh ] && source ./lib/function.sh
-
 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
 IMAGE_SIZE=4
+PACKAGE_DEPENDENCY="make curl npm nodejs jq php-xml php-pear php-mbstring unzip"
 
-STEP="minimum_package envinit default_prebuild build makedeb"
+STEP="base_package_upgrade install_package_dependency default_prebuild build makedeb"
-
-envinit() {
-	apt-get update
-	apt-get dist-upgrade -y
-	apt-get install -y --no-install-recommends make curl npm nodejs jq php-xml php-pear php-mbstring unzip
-}
 
 build() {
 	cd /tmp/${APP}

ressources/rss-bridge/debmaker

@@ -1,9 +1,6 @@
 #!/bin/bash
 
 VERSION=2022-06-14
-
-[ -e ./lib/function.sh ] && source ./lib/function.sh
-
 APP=rss-bridge
 DEPOT=https://github.com/RSS-Bridge/rss-bridge.git
 GIT_VERSION=$VERSION
@@ -11,24 +8,12 @@ DEB_VERSION=$VERSION-$(date +%Y%m%d%H%M)
 DEBIAN_VERSION_CODENAME=bullseye
 IMAGE_SIZE=1
 
-STEP="envinit prebuild makedeb"
+STEP="base_package_upgrade  default_prebuild makedeb"
-
-envinit() {
-	apt-get update
-	apt-get dist-upgrade -y
-	apt install -y --no-install-recommends git fakeroot dpkg git
-}
-
-prebuild(){
-	[ -e /tmp/${APP} ] && rm -fr /tmp/${APP}
-	git clone --depth 1 -b ${GIT_VERSION} ${DEPOT} /tmp/${APP}
-	
-}
 
 makedeb(){
 	PATH_DEB=/tmp/src/rootfs
 
-	cp -fr /tmp/rss-bridge ${PATH_DEB}/usr/share/
+	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

ressources/rustdesk-server/debmaker

@@ -1,7 +1,5 @@
 #!/bin/bash
 
-[ -e ./lib/function.sh ] && source ./lib/function.sh
-
 APP=rustdesk-server
 VERSION=1.1.5-1
 GIT_VERSION=$VERSION
@@ -10,25 +8,14 @@ DEBIAN_VERSION_CODENAME=bullseye
 IMAGE_SIZE=5
 DEPOT=https://github.com/rustdesk/rustdesk-server.git
 
-STEP="envinit prebuild build makedeb"
+STEP="minimum_package envinit prebuild build makedeb"
 
 envinit() {
         apt-get update
         apt-get dist-upgrade -y
-	apt install -y --no-install-recommends wget fakeroot dpkg ca-certificates build-essential git
+        apt install -y --no-install-recommends build-essential 
-	apt clean
-}
-
-STEP="envinit prebuild build makedeb"
-
-envinit() {
-        apt-get update
-        apt-get dist-upgrade -y
-        apt install -y --no-install-recommends build-essential git wget fakeroot dpkg ca-certificates
-        cd /tmp
-        wget -qO - https://sh.rustup.rs > rustup
-        bash rustup -qy
         apt clean
+        install_rust
 }
 
 prebuild(){

ressources/tt-rss/debmaker

@@ -1,40 +1,21 @@
 #!/bin/bash
 
-[ -e ./lib/function.sh ] && source ./lib/function.sh
-
 APP=tt-rss
 VERSION=$(date +%Y%m.%d.%H%M)
-GIT_VERSION=$VERSION
+GIT_VERSION=last
 DEB_VERSION=$VERSION
 DEBIAN_VERSION_CODENAME=bullseye
 IMAGE_SIZE=1
+DEPOT=https://git.tt-rss.org/fox/tt-rss.git
 
-STEP="envinit prebuild makedeb"
+STEP="base_package_upgrade get_git_source makedeb"
-# build 
-
-envinit() {
-	apt-get update
-	apt-get dist-upgrade -y
-	apt-get install -y --no-install-recommends wget ca-certificates fakeroot dpkg git
-	apt clean
-}
-
-prebuild(){
-	[ -e /tmp/${APP} ] && rm -fr /tmp/${APP}
-	git clone --depth 1 https://git.tt-rss.org/fox/tt-rss.git /tmp/${APP}
-}
-
-build() {
-	cd /tmp/${APP}
-}
 
 makedeb(){
 	PATH_DEB=/tmp/src/rootfs
 
-	cp -fr /tmp/tt-rss/* ${PATH_DEB}/usr/share/tt-rss/
+	cp -fr /tmp/${APP}/* ${PATH_DEB}/usr/share/tt-rss/
-	mv ${PATH_DEB}/usr/share/tt-rss/cache ${PATH_DEB}/var/lib/tt-rss/
+	
-	mv ${PATH_DEB}/usr/share/tt-rss/feed-icons ${PATH_DEB}/var/lib/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/lock ${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
@@ -42,6 +23,7 @@ makedeb(){
 	ln -s /var/lib/tt-rss/lock ${PATH_DEB}/usr/share/tt-rss/lock
 
 	ln -s /etc/tt-rss/config.php ${PATH_DEB}/usr/share/tt-rss/config.php
+
 	sed -i "s/%VERSION%/$DEB_VERSION/" ${PATH_DEB}/DEBIAN/control
 	fakeroot dpkg-deb -Z gzip --build ${PATH_DEB} /tmp/dist
 }

ressources/vaultwarden-web/debmaker

@@ -1,25 +1,15 @@
 #!/bin/bash
 
 VERSION=2022.6.2
-
-[ -e ./lib/function.sh ] && source ./lib/function.sh
-
 APP=vaultwarden-web
 GIT_VERSION=v$VERSION
 DEB_VERSION=$VERSION-$(date +%Y%m%d%H%M)
 DEBIAN_VERSION_CODENAME=bullseye
 IMAGE_SIZE=5
 DEPOT=https://github.com/dani-garcia/bw_web_builds.git
+PACKAGE_DEPENDENCY="build-essential python nodejs"
 
-STEP="minimum_package envinit default_prebuild build makedeb"
+STEP="base_package_upgrade configure_depot_nodejs install_package_dependency get_git_source build makedeb"
-
-envinit() {
-	configure_depot_yarn
-	configure_depot_nodejs
-	apt-get update
-	apt-get dist-upgrade -y
-	apt install -y --no-install-recommends build-essential python nodejs
-}
 
 build() {
 	cd /tmp/${APP}

ressources/vaultwarden/debmaker

@@ -1,24 +1,15 @@
 #!/bin/bash
 
 VERSION=1.25.2
-
-[ -e ./lib/function.sh ] && source ./lib/function.sh
-
 APP=vaultwarden
 GIT_VERSION=$VERSION
 DEB_VERSION=$VERSION-$(date +%Y%m%d%H%M)
 DEBIAN_VERSION_CODENAME=bullseye
 IMAGE_SIZE=8
 DEPOT=https://github.com/dani-garcia/vaultwarden.git
+PACKAGE_DEPENDENCY="build-essential libmariadb-dev libpq-dev pkg-config libmysql++-dev"
 
-STEP="minimum_package envinit default_prebuild build makedeb"
+STEP="base_package_upgrade install_package_dependency install_rust default_prebuild build makedeb"
-
-envinit() {
-	apt-get update
-	apt-get dist-upgrade -y
-	apt install -y --no-install-recommends build-essential libmariadb-dev libpq-dev pkg-config libmysql++-dev
-	install_rust
-}
 
 build() {
 	cd /tmp/${APP}

ressources/wallabag/debmaker

@@ -1,26 +1,19 @@
 #!/bin/bash
 
-[ -e ./lib/function.sh ] && source ./lib/function.sh
-
-APP=wallabag
 VERSION=2.5.1
+APP=wallabag
 GIT_VERSION=$VERSION
 DEB_VERSION=${VERSION}-$(date +%Y%m%d%H%M)
 DEBIAN_VERSION_CODENAME=bullseye
 IMAGE_SIZE=4
 DEPOT=https://github.com/wallabag/wallabag.git
 
-STEP="envinit prebuild build makedeb"
+STEP="base_package_upgrade envinit prebuild build makedeb"
 
 envinit() {
-	apt-get update
+	configure_depot_yarn
-	apt-get dist-upgrade -y
+	configure_depot_nodejs
-	apt-get install -y --no-install-recommends wget ca-certificates git php-common php-xml php-json php-gd php-mbstring php-xml php-tidy php-curl  php-tokenizer php-bcmath php-intl php-fpm unzip fakeroot dpkg gpg make
+	apt-get install -y --no-install-recommends php-common php-xml php-json php-gd php-mbstring php-xml php-tidy php-curl  php-tokenizer php-bcmath php-intl php-fpm unzip make yarn nodejs
-	wget -qO - https://deb.nodesource.com/setup_16.x | bash
-	wget -qO - https://dl.yarnpkg.com/debian/pubkey.gpg | gpg --dearmor  > /usr/share/keyrings/yarnkey.gpg
-	echo "deb [signed-by=/usr/share/keyrings/yarnkey.gpg] https://dl.yarnpkg.com/debian stable main" > /etc/apt/sources.list.d/yarn.list
-	apt-get update
-	apt-get install -y yarn nodejs
 }
 
 prebuild(){

ressources/zigbee2mqtt/debmaker

@@ -1,9 +1,6 @@
 #!/bin/bash
 
-VERSION=1.27.0
+VERSION=1.27.2
-
-[ -e ./lib/function.sh ] && source ./lib/function.sh
-
 APP=zigbee2mqtt
 DEPOT=https://github.com/Koenkk/zigbee2mqtt.git
 GIT_VERSION=${VERSION}