Another refactor

merge joplin and joplin-server
This commit is contained in:
thomas 2022-02-28 23:26:47 +01:00
parent 931e499bd1
commit 55beb0e2e3
48 changed files with 198 additions and 228 deletions

View File

@ -8,24 +8,25 @@ All package are install with chroot environnement.
To create deb file you just need to run the bellow command : To create deb file you just need to run the bellow command :
```bash ```bash
. joplin-server2deb . ressources/joplin/joplin
debmaker_run debmaker_run
``` ```
This commande create joplin and joplin-server packages
### packages available in shared repository ### packages available in shared repository
- [adguardhome](#adguardhome) - [adguardhome](#adguardhome) [site](https://adguard.com/fr/adguard-home/overview.html)
- [authelia](#authelia) - [authelia](#authelia) [site](https://www.authelia.com/)
- [element-web](#element-web) - [element-web](#element-web) [site](https://element.io/)
- [gotify](#gotify) - [gotify](#gotify) [site](https://gotify.net/)
- [grocy](#grocy) - [grocy](#grocy) [site](https://grocy.info/)
- [joplin-server](#joplin-server) - [joplin-server](#joplin-server) [site](https://joplinapp.org/)
- [mautrix-syncproxy and mautrix-wsproxy](#mautrix-syncproxy-and-mautrix-wsproxy) - [mautrix-syncproxy and mautrix-wsproxy](#mautrix-syncproxy-and-mautrix-wsproxy) [site](https://docs.mau.fi/bridges/go/imessage/android/setup.html)
- [rss-bridge](#rss-bridge) - [rss-bridge](#rss-bridge) [site](https://github.com/rss-bridge/rss-bridge)
- [tt-rss](#tt-rss) - [tt-rss](#tt-rss) [site](https://tt-rss.org/)
- [vaultwarden and vaultwarden-web](#vaultwarden-and-vaultwarden-web) - [vaultwarden and vaultwarden-web](#vaultwarden-and-vaultwarden-web) [site](https://github.com/dani-garcia/vaultwarden)
- [wallabag](#wallabag) - [wallabag](#wallabag) [site](https://www.wallabag.it/)
- [zigbee2mqtt](#zigbee2mqtt) - [zigbee2mqtt](#zigbee2mqtt) [site](https://www.zigbee2mqtt.io/)
#### adguardhome #### adguardhome
```bash ```bash

View File

@ -1,10 +0,0 @@
#!/bin/bash
APP=adguardhome
VERSION=0.108.0-b.3
GIT_VERSION=v$VERSION
DEB_VERSION=$VERSION-1
DEBIAN_VERSION_CODENAME=bullseye
IMAGE_SIZE=4
source ./lib/function.sh

View File

@ -1,10 +0,0 @@
#!/bin/bash
APP=authelia
VERSION=4.33.2
GIT_VERSION=v$VERSION
DEB_VERSION=$VERSION-4
DEBIAN_VERSION_CODENAME=bullseye
IMAGE_SIZE=4
source ./lib/function.sh

View File

@ -1,10 +0,0 @@
#!/bin/bash
APP=element-web
VERSION=1.10.4
GIT_VERSION=v$VERSION
DEB_VERSION=$VERSION-1
DEBIAN_VERSION_CODENAME=bullseye
IMAGE_SIZE=
source ./lib/function.sh

View File

@ -1,11 +0,0 @@
#!/bin/bash
APP=gotify
VERSION=2.1.4
GIT_VERSION=v$VERSION
DEB_VERSION=$VERSION-2
DEBIAN_VERSION_CODENAME=bullseye
IMAGE_SIZE=4
source ./lib/function.sh

View File

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

View File

@ -1,11 +0,0 @@
#!/bin/bash
APP=joplin-server
VERSION=2.7.4
GIT_VERSION=server-v$VERSION
DEB_VERSION=$VERSION-2
DEBIAN_VERSION_CODENAME=bullseye
IMAGE_SIZE=6
source ./lib/function.sh

View File

@ -1,10 +0,0 @@
#!/bin/bash
APP=joplin
VERSION=2.7.13
GIT_VERSION=$VERSION
DEB_VERSION=$VERSION-1
DEBIAN_VERSION_CODENAME=bullseye
IMAGE_SIZE=
source ./lib/function.sh

View File

@ -1,6 +1,5 @@
#!/bin/bash #!/bin/bash
source ressources/${APP}/${APP}
DEBOOTSTRAP_DIR=cache/debootstrap/ DEBOOTSTRAP_DIR=cache/debootstrap/
MOUNT_PATH=/mnt/debmaker MOUNT_PATH=/mnt/debmaker
@ -48,7 +47,7 @@ zdebmaker_inject(){
sudo mkdir -p ${MOUNT_PATH}/${APP}/tmp/src sudo mkdir -p ${MOUNT_PATH}/${APP}/tmp/src
sudo cp -fr ressources/${APP}/* ${MOUNT_PATH}/${APP}/tmp/src sudo cp -fr ressources/${APP}/* ${MOUNT_PATH}/${APP}/tmp/src
sudo cp -fr lib/exec_in_chroot.sh ${MOUNT_PATH}/${APP}/tmp/src sudo cp -fr lib/exec_in_chroot.sh ${MOUNT_PATH}/${APP}/tmp/src
find ${MOUNT_PATH}/${APP}/tmp/src -name .gitkeep -exec rm {} \; sudo find ${MOUNT_PATH}/${APP}/tmp/src -name .gitkeep -exec rm {} \;
sudo umount ${MOUNT_PATH}/${APP}/ sudo umount ${MOUNT_PATH}/${APP}/
} }

View File

@ -1,10 +0,0 @@
#!/bin/bash
APP=mautrix-syncproxy
VERSION=0.0.1
GIT_VERSION=$VERSION
DEB_VERSION=$VERSION-1
DEBIAN_VERSION_CODENAME=bullseye
IMAGE_SIZE=2
source ./lib/function.sh

View File

@ -1,10 +0,0 @@
#!/bin/bash
APP=mautrix-whatsapp
VERSION=0.2.4
GIT_VERSION=v$VERSION
DEB_VERSION=$VERSION-3
DEBIAN_VERSION_CODENAME=bullseye
IMAGE_SIZE=
source ./lib/function.sh

View File

@ -1,10 +0,0 @@
#!/bin/bash
APP=mautrix-wsproxy
VERSION=1.0.0
GIT_VERSION=$VERSION
DEB_VERSION=$VERSION-1
DEBIAN_VERSION_CODENAME=bullseye
IMAGE_SIZE=2
source ./lib/function.sh

View File

@ -1,5 +1,14 @@
#!/bin/bash #!/bin/bash
[ -e ./lib/function.sh ] && source ./lib/function.sh
APP=adguardhome
VERSION=0.108.0-b.3
GIT_VERSION=v$VERSION
DEB_VERSION=$VERSION-1
DEBIAN_VERSION_CODENAME=bullseye
IMAGE_SIZE=4
STEP="envinit prebuild build makedeb" STEP="envinit prebuild build makedeb"
envinit() { envinit() {
@ -13,7 +22,6 @@ envinit() {
} }
prebuild(){ prebuild(){
GIT_VERSION=$1
git clone --depth 1 -b ${GIT_VERSION} https://github.com/AdguardTeam/AdGuardHome.git /tmp/adguardhome git clone --depth 1 -b ${GIT_VERSION} https://github.com/AdguardTeam/AdGuardHome.git /tmp/adguardhome
} }
@ -24,8 +32,6 @@ build() {
} }
makedeb(){ makedeb(){
GIT_VERSION=$1
DEB_VERSION=$2
PATH_DEB=/tmp/src/rootfs PATH_DEB=/tmp/src/rootfs
cp /tmp/adguardhome/AdGuardHome ${PATH_DEB}/usr/bin/adguardhome cp /tmp/adguardhome/AdGuardHome ${PATH_DEB}/usr/bin/adguardhome

View File

@ -1,5 +1,14 @@
#!/bin/bash #!/bin/bash
[ -e ./lib/function.sh ] && source ./lib/function.sh
APP=authelia
VERSION=4.33.2
GIT_VERSION=v$VERSION
DEB_VERSION=$VERSION-4
DEBIAN_VERSION_CODENAME=bullseye
IMAGE_SIZE=4
STEP="envinit prebuild build makedeb" STEP="envinit prebuild build makedeb"
envinit() { envinit() {

View File

@ -1,5 +1,14 @@
#!/bin/bash #!/bin/bash
[ -e ./lib/function.sh ] && source ./lib/function.sh
APP=element-web
VERSION=1.10.4
GIT_VERSION=v$VERSION
DEB_VERSION=$VERSION-1
DEBIAN_VERSION_CODENAME=bullseye
IMAGE_SIZE=
STEP="envinit prebuild build makedeb" STEP="envinit prebuild build makedeb"
envinit() { envinit() {

View File

@ -1,5 +1,14 @@
#!/bin/bash #!/bin/bash
[ -e ./lib/function.sh ] && source ./lib/function.sh
APP=gotify
VERSION=2.1.4
GIT_VERSION=v$VERSION
DEB_VERSION=$VERSION-2
DEBIAN_VERSION_CODENAME=bullseye
IMAGE_SIZE=4
STEP="envinit prebuild build makedeb" STEP="envinit prebuild build makedeb"
envinit() { envinit() {

View File

@ -1,5 +1,14 @@
#!/bin/bash #!/bin/bash
[ -e ./lib/function.sh ] && source ./lib/function.sh
APP=grocy
VERSION=3.2.0
GIT_VERSION=v$VERSION
DEB_VERSION=$VERSION-5
DEBIAN_VERSION_CODENAME=sid
IMAGE_SIZE=
STEP="envinit prebuild build makedeb" STEP="envinit prebuild build makedeb"
envinit() { envinit() {

View File

@ -1,38 +0,0 @@
#!/bin/bash
STEP="envinit prebuild build makedeb"
envinit() {
apt install -y --no-install-recommends 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(){
GIT_VERSION=$1
git clone --depth 1 -b ${GIT_VERSION} https://github.com/laurent22/joplin.git /tmp/joplin
cd /tmp/joplin
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(){
GIT_VERSION=$1
DEB_VERSION=$2
PATH_DEB=/tmp/src/rootfs
cp -fr /tmp/joplin/packages/* ${PATH_DEB}/usr/lib/joplin-server/
sed -i "s/%VERSION%/$DEB_VERSION/" ${PATH_DEB}/DEBIAN/control
fakeroot dpkg-deb -Z gzip --build ${PATH_DEB} /tmp/dist
}

View File

@ -1,20 +1,64 @@
#!/bin/bash #!/bin/bash
STEP="envinit makedeb" [ -e ./lib/function.sh ] && source ./lib/function.sh
APP=joplin
GIT_VERSION=v2.7.14
DEB_VERSION_DESKTOP=2.7.14-4
DEB_VERSION_SERVER=2.7.4-4
DEBIAN_VERSION_CODENAME=bullseye
IMAGE_SIZE=12
STEP="envinit prebuild build makedeb"
envinit() { envinit() {
apt-get install -y --no-install-recommends wget ca-certificates fakeroot dpkg apt install -y --no-install-recommends build-essential git python wget ca-certificates rsync fakeroot dpkg
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(){
git clone --depth 1 -b ${GIT_VERSION} https://github.com/laurent22/joplin.git /tmp/joplin
cd /tmp/joplin
# rm -fr packages/app*
# rm -fr packages/generator-joplin
# rm -fr packages/plugin-repo-cli
# rm -fr packages/plugins
rm -fr packages/app-mobile
}
build() {
cd /tmp/joplin/
BUILD_SEQUENCIAL=1 yarn install
cd packages/app-desktop
npm run dist
}
makedeb(){ makedeb(){
GIT_VERSION=$1 PATH_DEB=/tmp/src/rootfs-server/
DEB_VERSION=$2
PATH_DEB=/tmp/src/rootfs
wget https://github.com/laurent22/joplin/releases/download/v${GIT_VERSION}/Joplin-${GIT_VERSION}.AppImage -qO ${PATH_DEB}/usr/share/joplin/Joplin.AppImage cp -fr /tmp/joplin/packages/lib ${PATH_DEB}/usr/share/joplin-server/
chmod +x ${PATH_DEB}/usr/share/joplin/Joplin.AppImage cp -fr /tmp/joplin/packages/turndown-plugin-gfm ${PATH_DEB}/usr/share/joplin-server/
sed -i "s/%VERSION%/$DEB_VERSION/" ${PATH_DEB}/DEBIAN/control cp -fr /tmp/joplin/packages/turndown ${PATH_DEB}/usr/share/joplin-server/
cp -fr /tmp/joplin/packages/htmlpack ${PATH_DEB}/usr/share/joplin-server/
cp -fr /tmp/joplin/packages/fork-uslug ${PATH_DEB}/usr/share/joplin-server/
cp -fr /tmp/joplin/packages/fork-sax ${PATH_DEB}/usr/share/joplin-server/
cp -fr /tmp/joplin/packages/renderer ${PATH_DEB}/usr/share/joplin-server/
cp -fr /tmp/joplin/packages/fork-htmlparser2 ${PATH_DEB}/usr/share/joplin-server/
cp -fr /tmp/joplin/packages/tools ${PATH_DEB}/usr/share/joplin-server/
cp -fr /tmp/joplin/packages/server ${PATH_DEB}/usr/share/joplin-server/
sed -i "s/%VERSION%/$DEB_VERSION_SERVER/" ${PATH_DEB}/DEBIAN/control
fakeroot dpkg-deb -Z gzip --build ${PATH_DEB} /tmp/dist fakeroot dpkg-deb -Z gzip --build ${PATH_DEB} /tmp/dist
PATH_DEB=/tmp/src/rootfs-desktop/
cp /tmp/joplin/packages/app-desktop/dist/Joplin-*.AppImage ${PATH_DEB}/usr/share/joplin/Joplin.AppImage
sed -i "s/%VERSION%/$DEB_VERSION_DESKTOP/" ${PATH_DEB}/DEBIAN/control
fakeroot dpkg-deb -Z gzip --build ${PATH_DEB} /tmp/dist
} }

View File

@ -3,5 +3,6 @@ Version: %VERSION%
Section: base Section: base
Priority: optional Priority: optional
Architecture: all Architecture: all
Depends: nodejs
Maintainer: Thomas Legay <thomas@syngate.fr> Maintainer: Thomas Legay <thomas@syngate.fr>
Description: joplin Description: joplin desktop

View File

Before

Width:  |  Height:  |  Size: 4.2 KiB

After

Width:  |  Height:  |  Size: 4.2 KiB

View File

@ -1,5 +1,14 @@
#!/bin/bash #!/bin/bash
[ -e ./lib/function.sh ] && source ./lib/function.sh
APP=mautrix-syncproxy
VERSION=0.0.1
GIT_VERSION=$VERSION
DEB_VERSION=$VERSION-1
DEBIAN_VERSION_CODENAME=bullseye
IMAGE_SIZE=2
STEP="envinit prebuild build makedeb" STEP="envinit prebuild build makedeb"
envinit() { envinit() {

View File

@ -1,5 +1,15 @@
#!/bin/bash #!/bin/bash
[ -e ./lib/function.sh ] && source ./lib/function.sh
APP=mautrix-whatsapp
VERSION=0.2.4
GIT_VERSION=v$VERSION
DEB_VERSION=$VERSION-3
DEBIAN_VERSION_CODENAME=bullseye
IMAGE_SIZE=
STEP="envinit prebuild build makedeb" STEP="envinit prebuild build makedeb"
envinit() { envinit() {

View File

@ -1,5 +1,14 @@
#!/bin/bash #!/bin/bash
[ -e ./lib/function.sh ] && source ./lib/function.sh
APP=mautrix-wsproxy
VERSION=1.0.0
GIT_VERSION=$VERSION
DEB_VERSION=$VERSION-1
DEBIAN_VERSION_CODENAME=bullseye
IMAGE_SIZE=2
STEP="envinit prebuild build makedeb" STEP="envinit prebuild build makedeb"
envinit() { envinit() {

View File

@ -1,5 +1,14 @@
#!/bin/bash #!/bin/bash
[ -e ./lib/function.sh ] && source ./lib/function.sh
APP=rss-bridge
VERSION=2022-01-20
GIT_VERSION=$VERSION
DEB_VERSION=$VERSION-3
DEBIAN_VERSION_CODENAME=bullseye
IMAGE_SIZE=1
STEP="envinit prebuild makedeb" STEP="envinit prebuild makedeb"
envinit() { envinit() {

View File

@ -1,5 +1,14 @@
#!/bin/bash #!/bin/bash
[ -e ./lib/function.sh ] && source ./lib/function.sh
APP=tt-rss
VERSION=$(date +%Y%m.%d.%H%M)
GIT_VERSION=$VERSION
DEB_VERSION=$VERSION
DEBIAN_VERSION_CODENAME=bullseye
IMAGE_SIZE=1
STEP="envinit prebuild makedeb" STEP="envinit prebuild makedeb"
# build # build

View File

@ -1,5 +1,14 @@
#!/bin/bash #!/bin/bash
[ -e ./lib/function.sh ] && source ./lib/function.sh
APP=vaultwarden-web
VERSION=2.25.1
GIT_VERSION=v$VERSION
DEB_VERSION=$VERSION-2
DEBIAN_VERSION_CODENAME=bullseye
IMAGE_SIZE=
STEP="envinit prebuild build makedeb" STEP="envinit prebuild build makedeb"
envinit() { envinit() {

View File

@ -1,9 +1,19 @@
#!/bin/bash #!/bin/bash
[ -e ./lib/function.sh ] && source ./lib/function.sh
APP=vaultwarden
VERSION=1.24.0
GIT_VERSION=$VERSION
DEB_VERSION=$VERSION-1
DEBIAN_VERSION_CODENAME=bullseye
IMAGE_SIZE=6
STEP="envinit prebuild build makedeb" STEP="envinit prebuild build makedeb"
envinit() { envinit() {
apt install -y --no-install-recommends build-essential git wget fakeroot dpkg ca-certificates libmariadb-dev libpq-dev pkg-config libmysql++-dev apt install -y --no-install-recommends build-essential git wget fakeroot dpkg ca-certificates libmariadb-dev libpq-dev pkg-config libmysql++-dev
cd /tmp cd /tmp
wget -qO - https://sh.rustup.rs > rustup wget -qO - https://sh.rustup.rs > rustup
bash rustup -qy bash rustup -qy

View File

@ -1,5 +1,14 @@
#!/bin/bash #!/bin/bash
[ -e ./lib/function.sh ] && source ./lib/function.sh
APP=wallabag
VERSION=2.4.3
GIT_VERSION=$VERSION
DEB_VERSION=$VERSION-3
DEBIAN_VERSION_CODENAME=bullseye
IMAGE_SIZE=2
STEP="envinit prebuild build makedeb" STEP="envinit prebuild build makedeb"
envinit() { envinit() {

View File

@ -1,5 +1,14 @@
#!/bin/bash #!/bin/bash
[ -e ./lib/function.sh ] && source ./lib/function.sh
APP=zigbee2mqtt
VERSION=1.23.0
GIT_VERSION=$VERSION
DEB_VERSION=$VERSION-3
DEBIAN_VERSION_CODENAME=bullseye
IMAGE_SIZE=
STEP="envinit prebuild build makedeb" STEP="envinit prebuild build makedeb"
envinit() { envinit() {

View File

@ -1,10 +0,0 @@
#!/bin/bash
APP=rss-bridge
VERSION=2022-01-20
GIT_VERSION=$VERSION
DEB_VERSION=$VERSION-3
DEBIAN_VERSION_CODENAME=bullseye
IMAGE_SIZE=1
source ./lib/function.sh

View File

@ -1,10 +0,0 @@
#!/bin/bash
APP=tt-rss
VERSION=$(date +%Y%m.%d.%H%M)
GIT_VERSION=$VERSION
DEB_VERSION=$VERSION
DEBIAN_VERSION_CODENAME=bullseye
IMAGE_SIZE=1
source ./lib/function.sh

View File

@ -1,10 +0,0 @@
#!/bin/bash
APP=vaultwarden-web
VERSION=2.25.1
GIT_VERSION=v$VERSION
DEB_VERSION=$VERSION-2
DEBIAN_VERSION_CODENAME=bullseye
IMAGE_SIZE=
source ./lib/function.sh

View File

@ -1,10 +0,0 @@
#!/bin/bash
APP=vaultwarden
VERSION=1.24.0
GIT_VERSION=$VERSION
DEB_VERSION=$VERSION-1
DEBIAN_VERSION_CODENAME=bullseye
IMAGE_SIZE=6
source ./lib/function.sh

View File

@ -1,10 +0,0 @@
#!/bin/bash
APP=wallabag
VERSION=2.4.3
GIT_VERSION=$VERSION
DEB_VERSION=$VERSION-3
DEBIAN_VERSION_CODENAME=bullseye
IMAGE_SIZE=2
source ./lib/function.sh

View File

@ -1,10 +0,0 @@
#!/bin/bash
APP=zigbee2mqtt
VERSION=1.23.0
GIT_VERSION=$VERSION
DEB_VERSION=$VERSION-3
DEBIAN_VERSION_CODENAME=bullseye
IMAGE_SIZE=
source ./lib/function.sh