Add grocy

update version element-web2deb joplin2deb
update README

README.MD

@@ -1,4 +1,6 @@
 ## DEBMAKER
+The main goal of this repository is allow to create application from source without install all compilation utility directly on the main system.
+All package are install in folder in chroot environnement with only one script.
 
 ### Requirement 
  - debootstrap (ie apt install debootstrap)
@@ -13,7 +15,13 @@ allstep
 
 ### package are available without compilation
 
-#### joplin server
+  - [joplin-server](#joplin-server)
+  - [rss-bridge](#rss-bridge)
+  - [vaultwarden](#vaultwarden)
+  - [zigbee2mqtt](#zigbee2mqtt)
+  - [element-web](#element-web)
+
+#### joplin-server
 
 ```bash
 apt install -y python wget ca-certificates
@@ -68,3 +76,22 @@ apt-get install -y zigbee2mqtt
 
 systemctl enable --now zigbee2mqtt
 ```
+
+
+#### element-web
+
+```bash
+wget -qO - https://deb.lgy.fr/install.sh | bash
+apt install element-web
+
+# sample configuration for apache2
+
+cp /usr/share/doc/element-web/apache2-element-web.conf /etc/apache2/sites-available/element-web.conf
+a2ensite element-web
+
+# edit /etc/apache2/sites-available/element-web.conf
+# edit /etc/element-web/config.json
+
+systemctl restart apache2
+```
+

element-web2deb

@@ -1,7 +1,7 @@
 #!/bin/bash
 
 APP=element-web
-VERSION=1.10.1
+VERSION=1.10.2
 GIT_VERSION=v$VERSION
 DEB_VERSION=$VERSION-2
 DEBIAN_VERSION_CODENAME=bullseye

grocy2deb

@@ -0,0 +1,9 @@
+#!/bin/bash
+
+APP=grocy
+VERSION=3.2.0
+GIT_VERSION=v$VERSION
+DEB_VERSION=$VERSION-5
+DEBIAN_VERSION_CODENAME=sid
+
+source ./lib/function.sh

joplin2deb

@@ -1,9 +1,9 @@
 #!/bin/bash
 
 APP=joplin
-VERSION=2.7.8
+VERSION=2.7.12
 GIT_VERSION=$VERSION
-DEB_VERSION=$VERSION-6
+DEB_VERSION=$VERSION-1
 DEBIAN_VERSION_CODENAME=bullseye
 
 source ./lib/function.sh

lib/function.sh

@@ -19,44 +19,39 @@ step1() {
 
 #InstallOs
 step2(){
-	if [ -e ressources/${APP}/envinit ]; then	
 		if [ ! -e ${CACHE_STEP2} ] ; then 
 			mkdir -p ${CACHE_APP}
 			cp -a ${CACHE_STEP1}/ ${CACHE_STEP2}
-			cp ressources/${APP}/envinit ${CACHE_STEP2}/tmp/envinit
+			cp ressources/${APP}/${APP} ${CACHE_STEP2}/tmp/make
 			mount -t proc proc ${CACHE_STEP2}/proc
 			sleep 2
-			chroot ${CACHE_STEP2} /tmp/envinit
+			chroot ${CACHE_STEP2} /tmp/make envinit
 			umount ${CACHE_STEP2}/proc
-			rm ${CACHE_STEP2}/tmp/envinit
+			rm ${CACHE_STEP2}/tmp/${APP}
 		fi
-	fi
 }
 
 #ConfigureBeforeBuild
 step3(){
-	if [ -e ressources/${APP}/prebuild ]; then
 		if [ ! -e ${CACHE_STEP3} ]; then
 			cp -a ${CACHE_STEP2} ${CACHE_STEP3}
-			cp ressources/${APP}/prebuild ${CACHE_STEP3}/tmp/prebuild
+			cp ressources/${APP}/${APP} ${CACHE_STEP3}/tmp/make
-			chroot ${CACHE_STEP3} /tmp/prebuild ${GIT_VERSION}
+			chroot ${CACHE_STEP3} /tmp/make prebuild ${GIT_VERSION}
-			rm ${CACHE_STEP3}/tmp/prebuild
+			rm ${CACHE_STEP3}/tmp/make
 		fi
-	fi
 }
 
 #Build
 step4(){
-	if [ -e ressources/${APP}/build ]; then
 		if [ ! -e ${CACHE_STEP4} ] ; then
 			cp -a ${CACHE_STEP3} ${CACHE_STEP4}
-			cp ressources/${APP}/build ${CACHE_STEP4}/tmp/build
+			cp ressources/${APP}/${APP} ${CACHE_STEP4}/tmp/make
 			mount -t proc proc ${CACHE_STEP4}/proc/
 			sleep 2
-			chroot ${CACHE_STEP4} /tmp/build
+			chroot ${CACHE_STEP4} /tmp/make build
 			umount ${CACHE_STEP4}/proc/
+			rm ${CACHE_STEP4}/tmp/make
 		fi
-	fi
 }
 
 #PackageDeb
@@ -64,7 +59,7 @@ step5(){
 	rm -fr dist/${APP}
 	mkdir dist/${APP}
 	cp -pfr ressources/${APP}/rootfs/* dist/$APP/
-	bash ressources/${APP}/makedeb ${CACHE_STEP4} dist/${APP} ${GIT_VERSION}
+	bash ressources/${APP}/${APP} makedeb ${CACHE_STEP4} dist/${APP} ${GIT_VERSION}
 	sed -i "s/%VERSION%/$DEB_VERSION/" dist/${APP}/DEBIAN/control
 	fakeroot dpkg-deb -Z gzip --build dist/${APP} dist
 	rm -fr dist/${APP}

ressources/authelia/authelia

@@ -0,0 +1,40 @@
+#!/bin/bash
+
+envinit() {
+	apt install -y build-essential git wget ca-certificates
+	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 nodejs
+	wget -qO - https://go.dev/dl/go1.17.3.linux-amd64.tar.gz | tar -C /usr/local -xz
+	wget -qO - https://get.pnpm.io/install.sh | sh -
+}
+
+prebuild(){
+	VERSION=$1
+	cd /tmp/
+	git clone https://github.com/authelia/authelia.git
+	cd authelia/
+	git checkout $VERSION
+}
+
+build() {
+	cd /tmp/authelia/
+	. /root/.bashrc
+	PATH=$PATH:/usr/local/go/bin bash bootstrap.sh
+	PATH=$PATH:/usr/local/go/bin  ./cmd/authelia-scripts/authelia-scripts build
+}
+
+makedeb(){
+	PATH_BUILD=$1
+	PATH_DEB=$2
+	GIT_VERSION=$3
+
+	cp ${PATH_BUILD}/tmp/authelia/dist/authelia ${PATH_DEB}/usr/bin/authelia
+	cp ${PATH_BUILD}/tmp/authelia/config.template.yml ${PATH_DEB}/etc/authelia/configuration.yml
+}
+echo $1
+FUNC=$1
+shift
+${FUNC} $*

ressources/authelia/build

@@ -1,5 +0,0 @@
-#!/bin/bash
-cd /tmp/authelia/
-. /root/.bashrc
-PATH=$PATH:/usr/local/go/bin bash bootstrap.sh
-PATH=$PATH:/usr/local/go/bin  ./cmd/authelia-scripts/authelia-scripts build

ressources/authelia/envinit

@@ -1,9 +0,0 @@
-#/bin/bash
-apt install -y build-essential git wget ca-certificates
-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 nodejs
-wget -qO - https://go.dev/dl/go1.17.3.linux-amd64.tar.gz | tar -C /usr/local -xz
-wget -qO - https://get.pnpm.io/install.sh | sh -

ressources/authelia/makedeb

@@ -1,8 +0,0 @@
-#!/bin/bash
-PATH_BUILD=$1
-PATH_DEB=$2
-GIT_VERSION=$3
-
-cp ${PATH_BUILD}/tmp/authelia/dist/authelia ${PATH_DEB}/usr/bin/authelia
-cp ${PATH_BUILD}/tmp/authelia/config.template.yml ${PATH_DEB}/etc/authelia/configuration.yml
-

ressources/authelia/prebuild

@@ -1,6 +0,0 @@
-#!/bin/bash
-VERSION=$1
-cd /tmp/
-git clone https://github.com/authelia/authelia.git
-cd authelia/
-git checkout $VERSION

ressources/element-web/build

@@ -1,4 +0,0 @@
-#!/bin/bash
-cd /tmp/element-web
-yarn install
-yarn dist

ressources/element-web/element-web

@@ -0,0 +1,37 @@
+#!/bin/bash
+
+envinit() {
+	apt install -y build-essential git python wget ca-certificates
+	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(){
+	VERSION=$1
+	cd /tmp/
+	git clone https://github.com/vector-im/element-web.git
+	cd element-web/
+	git checkout $VERSION
+}
+
+build() {
+	cd /tmp/element-web
+	yarn install
+	yarn dist
+}
+
+makedeb(){
+	PATH_BUILD=$1
+	PATH_DEB=$2
+	GIT_VERSION=$3
+
+	tar -zxf ${PATH_BUILD}/tmp/element-web/dist/element-${GIT_VERSION}-dirty.tar.gz --strip-components=1 -C ${PATH_DEB}/usr/lib/element-web/
+	cp ${PATH_DEB}/usr/lib/element-web/config.sample.json ${PATH_DEB}/etc/element-web/config.json
+}
+echo $1
+FUNC=$1
+shift
+${FUNC} $*

ressources/element-web/envinit

@@ -1,7 +0,0 @@
-#/bin/bash
-apt install -y build-essential git python wget ca-certificates
-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

ressources/element-web/makedeb

@@ -1,7 +0,0 @@
-#!/bin/bash
-PATH_BUILD=$1
-PATH_DEB=$2
-GIT_VERSION=$3
-
-tar -zxf ${PATH_BUILD}/tmp/element-web/dist/element-${GIT_VERSION}-dirty.tar.gz --strip-components=1 -C ${PATH_DEB}/usr/lib/element-web/
-cp ${PATH_DEB}/usr/lib/element-web/config.sample.json ${PATH_DEB}/etc/element-web/config.json

ressources/element-web/prebuild

@@ -1,6 +0,0 @@
-#!/bin/bash
-VERSION=$1
-cd /tmp/
-git clone https://github.com/vector-im/element-web.git
-cd element-web/
-git checkout $VERSION

ressources/gotify/build

@@ -1,4 +0,0 @@
-#!/bin/bash
-cd /tmp/server/
-. /root/.bashrc
-PATH=$PATH:/usr/local/go/bin make

ressources/gotify/envinit

@@ -1,8 +0,0 @@
-#/bin/bash
-apt install -y build-essential git wget ca-certificates
-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 nodejs yarn
-wget -qO - https://go.dev/dl/go1.17.6.linux-amd64.tar.gz | tar -C /usr/local -xz

ressources/gotify/gotify

@@ -0,0 +1,38 @@
+#!/bin/bash
+
+envinit() {
+	apt install -y build-essential git wget ca-certificates
+	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 nodejs yarn
+	wget -qO - https://go.dev/dl/go1.17.6.linux-amd64.tar.gz | tar -C /usr/local -xz
+}
+
+prebuild(){
+	VERSION=$1
+	cd /tmp/
+	git clone https://github.com/gotify/server.git
+	cd server/
+	git checkout ${VERSION}
+}
+
+build() {
+	cd /tmp/server/
+	. /root/.bashrc
+	PATH=${PATH}:/usr/local/go/bin make
+}
+
+makedeb(){
+	PATH_BUILD=$1
+	PATH_DEB=$2
+	GIT_VERSION=$3
+
+	cp ${PATH_BUILD}/tmp/gotify/dist/gotify ${PATH_DEB}/usr/bin/gotify
+	cp ${PATH_BUILD}/tmp/authelia/config.template.yml ${PATH_DEB}/etc/authelia/configuration.yml
+}
+echo $1
+FUNC=$1
+shift
+${FUNC} $*

ressources/gotify/makedeb

@@ -1,8 +0,0 @@
-#!/bin/bash
-PATH_BUILD=$1
-PATH_DEB=$2
-GIT_VERSION=$3
-
-cp ${PATH_BUILD}/tmp/gotify/dist/gotify ${PATH_DEB}/usr/bin/gotify
-cp ${PATH_BUILD}/tmp/authelia/config.template.yml ${PATH_DEB}/etc/authelia/configuration.yml
-

ressources/gotify/prebuild

@@ -1,6 +0,0 @@
-#!/bin/bash
-VERSION=$1
-cd /tmp/
-git clone https://github.com/gotify/server.git
-cd server/
-git checkout $VERSION

ressources/grocy/grocy

@@ -0,0 +1,40 @@
+#!/bin/bash
+
+envinit() {
+	apt-get install -y wget ca-certificates gnupg2 composer git php-simplexml php-gd
+	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 
+}
+
+prebuild(){
+	VERSION=$1
+	git clone https://github.com/grocy/grocy.git /tmp/grocy
+	cd /tmp/grocy/
+	git checkout $VERSION
+}
+
+build() {
+	set +x
+	cd /tmp/grocy
+	composer install -n
+	yarn install
+}
+
+makedeb(){
+	PATH_BUILD=$1
+	PATH_DEB=$2
+	GIT_VERSION=$3
+
+	find ${PATH_BUILD}/tmp/grocy -name .gitignore -exec rm {} \;
+	cp -fr ${PATH_BUILD}/tmp/grocy/* ${PATH_DEB}/usr/share/grocy/
+	cp  ${PATH_DEB}/usr/share/grocy/config-dist.php ${PATH_DEB}/etc/grocy/config.php
+	mv ${PATH_DEB}/usr/share/grocy/data ${PATH_DEB}/var/lib/grocy/
+	ln -s /var/lib/grocy/data/  ${PATH_DEB}/usr/share/grocy/data
+	ln -s /etc/grocy/config.php  ${PATH_DEB}/usr/share/grocy/config.php
+}
+echo $1
+FUNC=$1
+shift
+${FUNC} $*

ressources/grocy/rootfs/DEBIAN/conffiles

@@ -0,0 +1 @@
+/etc/grocy/config.php

ressources/grocy/rootfs/DEBIAN/control

@@ -0,0 +1,8 @@
+Package: grocy
+Version: %VERSION%
+Section: base
+Priority: optional
+Architecture: all
+Depends: php-simplexml, php-gd, php-sqlite3, php-intl, php-mbstring
+Maintainer: Thomas Legay <thomas@syngate.fr>
+Description: grocy 

ressources/grocy/rootfs/DEBIAN/postinst

@@ -0,0 +1,2 @@
+#!/bin/bash
+chown www-data:www-data /var/lib/grocy

ressources/grocy/rootfs/usr/share/doc/grocy/apache2-grocy.conf

@@ -0,0 +1,11 @@
+<VirtualHost *:80>
+	ServerName grocy.net.lgy.fr
+
+	DocumentRoot /usr/share/grocy/public/
+        
+	<directory /usr/share/grocy/public/>
+		Options -Indexes -MultiViews +FollowSymLinks
+		AllowOverride all
+		Require all granted
+	</directory>
+</VirtualHost>

ressources/joplin-server/build

@@ -1,3 +0,0 @@
-#!/bin/bash
-cd /tmp/joplin/
-BUILD_SEQUENCIAL=1 yarn install

ressources/joplin-server/envinit

@@ -1,7 +0,0 @@
-#/bin/bash
-apt install -y build-essential git python wget ca-certificates
-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

ressources/joplin-server/joplin-server

@@ -0,0 +1,39 @@
+#!/bin/bash
+
+envinit() {
+	apt install -y build-essential git python wget ca-certificates
+	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(){
+	VERSION=$1
+	cd /tmp/
+	git clone https://github.com/laurent22/joplin.git
+	cd joplin/
+	git checkout $VERSION
+	rm -fr packages/app*
+	rm -fr packages/generator-joplin 
+	rm -fr packages/plugin-repo-cli
+	rm -fr packages/plugins
+}
+
+build() {
+	cd /tmp/joplin/
+	BUILD_SEQUENCIAL=1 yarn install
+}
+
+makedeb(){
+	PATH_BUILD=$1
+	PATH_DEB=$2
+	GIT_VERSION=$3
+
+	cp -fr ${PATH_BUILD}/tmp/joplin/packages/* ${PATH_DEB}/usr/lib/joplin-server/
+}
+echo $1
+FUNC=$1
+shift
+${FUNC} $*

ressources/joplin-server/makedeb

@@ -1,7 +0,0 @@
-#!/bin/bash
-PATH_BUILD=$1
-PATH_DEB=$2
-GIT_VERSION=$3
-
-cp -fr ${PATH_BUILD}/tmp/joplin/packages/* ${PATH_DEB}/usr/lib/joplin-server/
-

ressources/joplin-server/prebuild

@@ -1,10 +0,0 @@
-#!/bin/bash
-VERSION=$1
-cd /tmp/
-git clone https://github.com/laurent22/joplin.git
-cd joplin/
-git checkout $VERSION
-rm -fr packages/app*
-rm -fr packages/generator-joplin 
-rm -fr packages/plugin-repo-cli
-rm -fr packages/plugins

ressources/joplin/joplin

@@ -0,0 +1,26 @@
+#!/bin/bash
+
+envinit() {
+	ls
+}
+
+prebuild(){
+	ls
+}
+
+build() {
+	ls
+}
+
+makedeb(){
+	PATH_BUILD=$1
+	PATH_DEB=$2
+	GIT_VERSION=$3
+
+	wget https://github.com/laurent22/joplin/releases/download/v${GIT_VERSION}/Joplin-${GIT_VERSION}.AppImage -qO ${PATH_DEB}/usr/share/joplin/Joplin.AppImage
+	chmod +x ${PATH_DEB}/usr/share/joplin/Joplin.AppImage
+}
+echo $1
+FUNC=$1
+shift
+${FUNC} $*

ressources/joplin/makedeb

@@ -1,7 +0,0 @@
-#!/bin/bash
-PATH_BUILD=$1
-PATH_DEB=$2
-GIT_VERSION=$3
-
-wget https://github.com/laurent22/joplin/releases/download/v${GIT_VERSION}/Joplin-${GIT_VERSION}.AppImage -qO ${PATH_DEB}/usr/share/joplin/Joplin.AppImage
-chmod +x ${PATH_DEB}/usr/share/joplin/Joplin.AppImage

ressources/mautrix-whatsapp/build

@@ -1,4 +0,0 @@
-#/bin/bash
-cd /tmp/whatsapp/
-git checkout $1
-PATH=$PATH:/usr/local/go/bin ./build.sh 

ressources/mautrix-whatsapp/envinit

@@ -1,3 +0,0 @@
-#/bin/bash
-apt install -y ca-certificates git libolm3 libolm-dev build-essential wget
-wget -qO - https://go.dev/dl/go1.17.3.linux-amd64.tar.gz | tar -C /usr/local -xz

ressources/mautrix-whatsapp/makedeb

@@ -1,7 +0,0 @@
-#!/bin/bash
-PATH_BUILD=$1
-PATH_DEB=$2
-GIT_VERSION=$3
-
-cp ${PATH_BUILD}/tmp/whatsapp/mautrix-whatsapp ${PATH_DEB}/usr/lib/mautrix-whatsapp/mautrix-whatsapp
-cp ${PATH_BUILD}/tmp/whatsapp/example-config.yaml ${PATH_DEB}/etc/mautrix-whatsapp/config.yaml

ressources/mautrix-whatsapp/mautrix-whatsapp

@@ -0,0 +1,33 @@
+#!/bin/bash
+
+envinit() {
+	apt install -y ca-certificates git libolm3 libolm-dev build-essential wget
+	wget -qO - https://go.dev/dl/go1.17.3.linux-amd64.tar.gz | tar -C /usr/local -xz
+}
+
+prebuild(){
+	VERSION=$1
+	cd /tmp/
+	git clone https://github.com/mautrix/whatsapp.git
+	cd whatsapp/
+	git checkout $VERSION
+}
+
+build() {
+	cd /tmp/whatsapp/
+	git checkout $1
+	PATH=$PATH:/usr/local/go/bin ./build.sh 
+}
+
+makedeb(){
+	PATH_BUILD=$1
+	PATH_DEB=$2
+	GIT_VERSION=$3
+
+	cp ${PATH_BUILD}/tmp/whatsapp/mautrix-whatsapp ${PATH_DEB}/usr/lib/mautrix-whatsapp/mautrix-whatsapp
+	cp ${PATH_BUILD}/tmp/whatsapp/example-config.yaml ${PATH_DEB}/etc/mautrix-whatsapp/config.yaml
+}
+echo $1
+FUNC=$1
+shift
+${FUNC} $*

ressources/mautrix-whatsapp/prebuild

@@ -1,6 +0,0 @@
-#!/bin/bash
-VERSION=$1
-cd /tmp/
-git clone https://github.com/mautrix/whatsapp.git
-cd whatsapp/
-git checkout $VERSION

ressources/rss-bridge/build

@@ -1,2 +0,0 @@
-#!/bin/bash
-

ressources/rss-bridge/envinit

@@ -1,2 +0,0 @@
-#/bin/bash
-apt install -y git

ressources/rss-bridge/makedeb

@@ -1,16 +0,0 @@
-#!/bin/bash
-PATH_BUILD=$1
-PATH_DEB=$2
-GIT_VERSION=$3
-
-cp -fr ${PATH_BUILD}/tmp/rss-bridge ${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
-
-ln -s /etc/rss-bridge/config.ini.php ${PATH_DEB}/usr/share/rss-bridge/config.ini.php
-ln -s /etc/rss-bridge/whitelist.txt ${PATH_DEB}/usr/share/rss-bridge/whitelist.txt
-
-mkdir -p ${PATH_DEB}/var/cache/rss-bridge/cache/
-rm ${PATH_DEB}/usr/share/rss-bridge/cache
-ln -s /var/cache/rss-bridge/cache/ ${PATH_DEB}/usr/share/rss-bridge/cache

ressources/rss-bridge/prebuild

@@ -1,6 +0,0 @@
-#!/bin/bash
-VERSION=$1
-cd /tmp/
-git clone https://github.com/RSS-Bridge/rss-bridge.git
-cd rss-bridge/
-git checkout $VERSION

ressources/rss-bridge/rss-bridge

@@ -0,0 +1,39 @@
+#!/bin/bash
+
+envinit() {
+	apt install -y git
+}
+
+prebuild(){
+	VERSION=$1
+	cd /tmp/
+	git clone https://github.com/RSS-Bridge/rss-bridge.git
+	cd rss-bridge/
+	git checkout $VERSION
+}
+
+build() {
+
+}
+
+makedeb(){
+	PATH_BUILD=$1
+	PATH_DEB=$2
+	GIT_VERSION=$3
+
+	cp -fr ${PATH_BUILD}/tmp/rss-bridge ${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
+
+	ln -s /etc/rss-bridge/config.ini.php ${PATH_DEB}/usr/share/rss-bridge/config.ini.php
+	ln -s /etc/rss-bridge/whitelist.txt ${PATH_DEB}/usr/share/rss-bridge/whitelist.txt
+
+	mkdir -p ${PATH_DEB}/var/cache/rss-bridge/cache/
+	rm ${PATH_DEB}/usr/share/rss-bridge/cache
+	ln -s /var/cache/rss-bridge/cache/ ${PATH_DEB}/usr/share/rss-bridge/cache
+}
+echo $1
+FUNC=$1
+shift
+${FUNC} $*

ressources/standardnotes-web/build

@@ -1,5 +0,0 @@
-#!/bin/bash
-cd /tmp/web
-PATH=$PATH:/tmp/web/bin
-npm install
-npm run build

ressources/standardnotes-web/envinit

@@ -1,7 +0,0 @@
-#/bin/bash
-apt install -y git build-essential python2 wget ruby-dev libxml2 libz-dev
-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

ressources/standardnotes-web/makedeb

@@ -1,6 +0,0 @@
-#!/bin/bash
-PATH_BUILD=$1
-PATH_DEB=$2
-GIT_VERSION=$3
-
-cp -fr ${PATH_BUILD}/tmp/web/* ${PATH_DEB}/usr/lib/standardnotes/web/

ressources/standardnotes-web/prebuild

@@ -1,6 +0,0 @@
-#!/bin/bash
-VERSION=$1
-cd /tmp/
-git clone https://github.com/standardnotes/web.git
-cd web/
-git checkout $VERSION

ressources/standardnotes-web/standardnotes-web

@@ -0,0 +1,37 @@
+#!/bin/bash
+
+envinit() {
+	apt install -y git build-essential python2 wget ruby-dev libxml2 libz-dev
+	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(){
+	VERSION=$1
+	cd /tmp/
+	git clone https://github.com/standardnotes/web.git
+	cd web/
+	git checkout $VERSION
+}
+
+build() {
+	cd /tmp/web
+	PATH=$PATH:/tmp/web/bin
+	npm install
+	npm run build
+}
+
+makedeb(){
+	PATH_BUILD=$1
+	PATH_DEB=$2
+	GIT_VERSION=$3
+
+	cp -fr ${PATH_BUILD}/tmp/web/* ${PATH_DEB}/usr/lib/standardnotes/web/
+}
+echo $1
+FUNC=$1
+shift
+${FUNC} $*

ressources/vaultwarden-web/build

@@ -1,4 +0,0 @@
-#!/bin/bash
-cd /tmp/web-vault
-npm install
-npm run dist:oss:selfhost

ressources/vaultwarden-web/envinit

@@ -1,8 +0,0 @@
-#/bin/bash
-apt install -y build-essential git python wget ca-certificates
-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
-apt-get install -y nodejs

ressources/vaultwarden-web/makedeb

@@ -1,6 +0,0 @@
-#!/bin/bash
-PATH_BUILD=$1
-PATH_DEB=$2
-GIT_VERSION=$3
-
-cp -fr ${PATH_BUILD}/tmp/web-vault/build/* ${PATH_DEB}/usr/share/vaultwarden-web

ressources/vaultwarden-web/prebuild

@@ -1,19 +0,0 @@
-#!/bin/bash
-VERSION=$1
-
-cd /tmp
-git clone https://github.com/bitwarden/web.git web-vault
-cd /tmp/web-vault
-git checkout ${VERSION}
-git submodule update --init --recursive
-cd ..
-
-git clone https://github.com/dani-garcia/bw_web_builds.git
-cd bw_web_builds
-PATCH=$(git tag --sort=v:refname | tail -n1)
-git checkout ${PATCH}
-cp patches/${PATCH}.patch ../web-vault/
-
-cd /tmp/web-vault
-git apply ${PATCH}.patch
-

ressources/vaultwarden-web/vaultwarden-web

@@ -0,0 +1,49 @@
+#!/bin/bash
+
+envinit() {
+	apt install -y build-essential git python wget ca-certificates
+	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
+	apt-get install -y nodejs
+}
+
+prebuild(){
+	VERSION=$1
+
+	cd /tmp
+	git clone https://github.com/bitwarden/web.git web-vault
+	cd /tmp/web-vault
+	git checkout ${VERSION}
+	git submodule update --init --recursive
+	cd ..
+
+	git clone https://github.com/dani-garcia/bw_web_builds.git
+	cd bw_web_builds
+	PATCH=$(git tag --sort=v:refname | tail -n1)
+	git checkout ${PATCH}
+	cp patches/${PATCH}.patch ../web-vault/
+
+	cd /tmp/web-vault
+	git apply ${PATCH}.patch
+}
+
+build() {
+	cd /tmp/web-vault
+	npm install
+	npm run dist:oss:selfhost
+}
+
+makedeb(){
+	PATH_BUILD=$1
+	PATH_DEB=$2
+	GIT_VERSION=$3
+
+	cp -fr ${PATH_BUILD}/tmp/web-vault/build/* ${PATH_DEB}/usr/share/vaultwarden-web
+}
+echo $1
+FUNC=$1
+shift
+${FUNC} $*

ressources/vaultwarden/build

@@ -1,4 +0,0 @@
-#!/bin/bash
-cd /tmp/vaultwarden/
-source ~/.cargo/env
-cargo build --features sqlite,mysql,postgresql --release

ressources/vaultwarden/envinit

@@ -1,6 +0,0 @@
-#/bin/bash
-apt install -y --no-install-recommends build-essential git wget ca-certificates libmariadb-dev libpq-dev pkg-config libmysql++-dev
-cd /tmp 
-wget -qO - https://sh.rustup.rs > rustup
-bash rustup -qy
-apt clean

ressources/vaultwarden/makedeb

@@ -1,7 +0,0 @@
-#!/bin/bash
-PATH_BUILD=$1
-PATH_DEB=$2
-GIT_VERSION=$3
-
-cp -fr ${PATH_BUILD}/tmp/vaultwarden/target/release/vaultwarden ${PATH_DEB}/usr/lib/vaultwarden/
-

ressources/vaultwarden/prebuild

@@ -1,6 +0,0 @@
-#!/bin/bash
-VERSION=$1
-cd /tmp/
-git clone https://github.com/dani-garcia/vaultwarden.git
-cd vaultwarden/
-git checkout $VERSION

ressources/vaultwarden/vaultwarden

@@ -0,0 +1,35 @@
+#!/bin/bash
+
+envinit() {
+	apt install -y --no-install-recommends build-essential git wget ca-certificates libmariadb-dev libpq-dev pkg-config libmysql++-dev
+	cd /tmp 
+	wget -qO - https://sh.rustup.rs > rustup
+	bash rustup -qy
+	apt clean
+}
+
+prebuild(){
+	VERSION=$1
+	cd /tmp/
+	git clone https://github.com/dani-garcia/vaultwarden.git
+	cd vaultwarden/
+	git checkout $VERSION
+}
+
+build() {
+	cd /tmp/vaultwarden/
+	source ~/.cargo/env
+	cargo build --features sqlite,mysql,postgresql --release
+}
+
+makedeb(){
+	PATH_BUILD=$1
+	PATH_DEB=$2
+	GIT_VERSION=$3
+
+	cp -fr ${PATH_BUILD}/tmp/vaultwarden/target/release/vaultwarden ${PATH_DEB}/usr/lib/vaultwarden/
+}
+echo $1
+FUNC=$1
+shift
+${FUNC} $*

ressources/zigbee2mqtt/build

@@ -1,4 +0,0 @@
-#!/bin/bash
-cd /tmp/zigbee2mqtt/
-npm ci
-npm run build

ressources/zigbee2mqtt/envinit

@@ -1,3 +0,0 @@
-#/bin/bash
-apt install -y wget ca-certificates nodejs npm git make g++ gcc
-

ressources/zigbee2mqtt/makedeb

@@ -1,8 +0,0 @@
-#!/bin/bash
-PATH_BUILD=$1
-PATH_DEB=$2
-GIT_VERSION=$3
-
-cp -fr ${PATH_BUILD}/tmp/zigbee2mqtt/data/configuration.yaml ${PATH_DEB}/etc/zigbee2mqtt/configuration.yaml
-cp -fr ${PATH_BUILD}/tmp/zigbee2mqtt/* ${PATH_DEB}/usr/lib/zigbee2mqtt/
-

ressources/zigbee2mqtt/prebuild

@@ -1,6 +0,0 @@
-#!/bin/bash
-VERSION=$1
-cd /tmp/
-git clone https://github.com/Koenkk/zigbee2mqtt.git
-cd zigbee2mqtt/
-git checkout $VERSION

ressources/zigbee2mqtt/zigbee2mqtt

@@ -0,0 +1,33 @@
+#!/bin/bash
+
+envinit() {
+	apt install -y wget ca-certificates nodejs npm git make g++ gcc
+}
+
+prebuild(){
+	VERSION=$1
+	cd /tmp/
+	git clone https://github.com/Koenkk/zigbee2mqtt.git
+	cd zigbee2mqtt/
+	git checkout $VERSION
+}
+
+build() {
+	cd /tmp/zigbee2mqtt/
+	npm ci
+	npm run build
+}
+
+makedeb(){
+	PATH_BUILD=$1
+	PATH_DEB=$2
+	GIT_VERSION=$3
+
+	cp -fr ${PATH_BUILD}/tmp/zigbee2mqtt/data/configuration.yaml ${PATH_DEB}/etc/zigbee2mqtt/configuration.yaml
+	cp -fr ${PATH_BUILD}/tmp/zigbee2mqtt/* ${PATH_DEB}/usr/lib/zigbee2mqtt/
+}
+
+echo $1
+FUNC=$1
+shift
+${FUNC} $*