From 5012543e4cb5794123c198d6afd8246e07313cea Mon Sep 17 00:00:00 2001
From: thomas <thomas@lgy.fr>
Date: Thu, 7 Jul 2022 23:11:32 +0200
Subject: [PATCH] new version element-web bitwarden-desktop

---
 ressources/bitwarden-desktop/debmaker |  9 +++------
 ressources/element-web/debmaker       | 10 ++++------
 2 files changed, 7 insertions(+), 12 deletions(-)

diff --git a/ressources/bitwarden-desktop/debmaker b/ressources/bitwarden-desktop/debmaker
index d32f4d6..3ba07d8 100755
--- a/ressources/bitwarden-desktop/debmaker
+++ b/ressources/bitwarden-desktop/debmaker
@@ -1,6 +1,6 @@
 #!/bin/bash
 
-VERSION=2022.6.0
+VERSION=2022.6.1
 
 [ -e ./lib/function.sh ] && source ./lib/function.sh
 
@@ -12,7 +12,6 @@ DEBIAN_VERSION_CODENAME=bullseye
 IMAGE_SIZE=10
 
 STEP="envinit prebuild build makedeb"
-STEP="envinit prebuild"
 
 envinit() {
 	apt-get update
@@ -26,10 +25,8 @@ envinit() {
 }
 
 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}
+        [ -e /tmp/${APP} ] && rm -fr /tmp/${APP}
+        git clone --depth 1 -b ${GIT_VERSION} ${DEPOT}  /tmp/${APP}
 }
 
 build() {
diff --git a/ressources/element-web/debmaker b/ressources/element-web/debmaker
index 5e1a376..ded23fb 100755
--- a/ressources/element-web/debmaker
+++ b/ressources/element-web/debmaker
@@ -1,6 +1,6 @@
 #!/bin/bash
 
-VERSION=1.10.15
+VERSION=1.11.0
 
 [ -e ./lib/function.sh ] && source ./lib/function.sh
 
@@ -29,10 +29,8 @@ envinit() {
 }
 
 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}
+	[ -e /tmp/${APP} ] && rm -fr /tmp/${APP}
+	git clone --depth 1 -b ${GIT_VERSION} ${DEPOT}  /tmp/${APP}
 }
 
 build() {
@@ -44,7 +42,7 @@ build() {
 makedeb(){
 	PATH_DEB=/tmp/src/rootfs
 	
-	tar -zxf /tmp/${APP}/dist/element-${GIT_VERSION}-dirty.tar.gz --strip-components=1 -C ${PATH_DEB}/usr/share/element-web/
+	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
 	sed -i "s/%VERSION%/$DEB_VERSION/" ${PATH_DEB}/DEBIAN/control
 	fakeroot dpkg-deb -Z gzip --build ${PATH_DEB} /tmp/dist