From f49047fe85035e2fd77d83c5e6a213c97195cbd0 Mon Sep 17 00:00:00 2001 From: Antoine Martin Date: Wed, 3 May 2023 01:40:48 -0400 Subject: [PATCH] trilium: lint --- user/trilium/APKBUILD | 52 +++++++++++++++++++++---------------------- 1 file changed, 26 insertions(+), 26 deletions(-) diff --git a/user/trilium/APKBUILD b/user/trilium/APKBUILD index 1fdd846..f1dfc2b 100644 --- a/user/trilium/APKBUILD +++ b/user/trilium/APKBUILD @@ -1,11 +1,11 @@ # Maintainer: Antoine Martin (ayakael) # Contributor: Antoine Martin (ayakael) -pkgname="trilium" +pkgname=trilium pkgver=0.59.4 pkgrel=0 pkgdesc="A hierarchical note taking application with focus on building large personal knowledge bases." -arch="x86_64'" +arch="x86_64" url="https://github.com/zadam/trilium" license="AGPL-3.0" depends="electron" @@ -26,7 +26,7 @@ source="$pkgname-$pkgver.tar.gz::https://github.com/zadam/trilium/archive/refs/t prepare() { default_prepare - sed -i "s|@electronversion@|$_electron_version|" ../trilium.sh + sed -i "s|@electronversion@||" ../trilium.sh } _trilium_desktop_src_dir=./dist/trilium-linux-x64-src @@ -36,7 +36,7 @@ build() { export npm_config_cache="$srcdir/npm_cache" export ELECTRON_SKIP_BINARY_DOWNLOAD=1 npm install --build-from-source - + # Building trilium (desktop) ./bin/copy-trilium.sh $_trilium_desktop_src_dir rm -rf $_trilium_desktop_src_dir/dump-db @@ -45,19 +45,19 @@ build() { npx electron-builder --linux --x64 --dir \ --project=$_trilium_desktop_src_dir \ - -c.electronDist=/usr/lib/electron$_electron_version \ - -c.electronVersion=$(electron$_electron_version --version | tail -c +2) + -c.electronDist=/usr/lib/electron \ + -c.electronVersion="$(electron --version | tail -c +2)" # Building trilium-server grep -v electron package.json > package-server.json mv package-server.json package.json - + ./bin/copy-trilium.sh $_trilium_server_src_dir rm -rf $_trilium_server_src_dir/dump-db - + mkdir $_trilium_server_src_dir/node_modules/better-sqlite3/build/Release cp ./node_modules/better-sqlite3/build/Release/better_sqlite3.node $_trilium_server_src_dir/node_modules/better-sqlite3/build/Release/better_sqlite3.node - + rm -r $_trilium_server_src_dir/webpack* rm -r $_trilium_server_src_dir/electron.js @@ -69,42 +69,42 @@ build() { } package() { - install -vDm644 $_trilium_desktop_src_dir/dist/linux-unpacked/resources/app.asar -t "${pkgdir}/usr/lib/${pkgname}" - install -vDm644 $_trilium_desktop_src_dir/package.json -t "${pkgdir}/usr/lib/${pkgname}" - install -vDm644 bin/tpl/anonymize-database.sql -t "${pkgdir}/usr/lib/${pkgname}" + install -vDm644 $_trilium_desktop_src_dir/dist/linux-unpacked/resources/app.asar -t "$pkgdir/usr/lib/$pkgname" + install -vDm644 $_trilium_desktop_src_dir/package.json -t "$pkgdir/usr/lib/$pkgname" + install -vDm644 bin/tpl/anonymize-database.sql -t "$pkgdir/usr/lib/$pkgname" for i in 16 32 64 128 256 512; do - install -vDm644 images/app-icons/png/${i}x${i}.png "${pkgdir}/usr/share/icons/hicolor/${i}x${i}/apps/${pkgname}.png" + install -vDm644 images/app-icons/png/${i}x$i.png "$pkgdir/usr/share/icons/hicolor/${i}x$i/apps/$pkgname.png" done - install -vDm755 "${srcdir}/${pkgname}.sh" "${pkgdir}/usr/bin/trilium" - install -vDm644 "${srcdir}"/${pkgname}.desktop -t "${pkgdir}"/usr/share/applications + install -vDm755 "$srcdir/$pkgname.sh" "$pkgdir/usr/bin/trilium" + install -vDm644 "$srcdir"/$pkgname.desktop -t "$pkgdir"/usr/share/applications } server() { pkgdesc="A hierarchical note taking application with focus on building large personal knowledge bases - Server version" depends="nodejs" - install -vd "${pkgdir}/usr/share/webapps/${pkgname}" - cp -vr $_trilium_server_src_dir/. -t "${pkgdir}/usr/share/webapps/${pkgname}" - chmod -v 755 "${pkgdir}/usr/share/webapps/${pkgname}/src/www" - install -vDm644 $_trilium_server_src_dir/package.json -t "${pkgdir}/usr/share/webapps/${pkgname}" - install -vDm644 bin/tpl/anonymize-database.sql -t "${pkgdir}/usr/share/webapps/${pkgname}" + install -vd "$pkgdir/usr/share/webapps/$pkgname" + cp -vr $_trilium_server_src_dir/. -t "$pkgdir/usr/share/webapps/$pkgname" + chmod -v 755 "$pkgdir/usr/share/webapps/$pkgname/src/www" + install -vDm644 $_trilium_server_src_dir/package.json -t "$pkgdir/usr/share/webapps/$pkgname" + install -vDm644 bin/tpl/anonymize-database.sql -t "$pkgdir/usr/share/webapps/$pkgname" - install -vDm755 "${srcdir}/${pkgname}.sh" "${pkgdir}/usr/bin/trilium-server" + install -vDm755 "$srcdir/$pkgname.sh" "$pkgdir/usr/bin/trilium-server" # TODO: setup openrc - # install -vDm644 "${srcdir}"/${pkgname}.service -t "${pkgdir}/usr/lib/systemd/system" + # install -vDm644 "$srcdir"/$pkgname.service -t "$pkgdir/usr/lib/systemd/system" } dumpdb() { pkgdesc="An emergency tool to extract notes from the database where they're stored to plain files on the filesystem" depends="nodejs" - install -vd "${pkgdir}/usr/lib/${pkgname}" - cp -vr dump-db/. -t "${pkgdir}/usr/lib/${pkgname}" - chmod -v 755 "${pkgdir}/usr/lib/${pkgname}/dump-db.js" + install -vd "$pkgdir/usr/lib/$pkgname" + cp -vr dump-db/. -t "$pkgdir/usr/lib/$pkgname" + chmod -v 755 "$pkgdir/usr/lib/$pkgname/dump-db.js" - install -vDm755 "${srcdir}/${pkgname}.sh" "${pkgdir}/usr/bin/trilium-dumpdb" + install -vDm755 "$srcdir/$pkgname.sh" "$pkgdir/usr/bin/trilium-dumpdb" } sha512sums=" 96a4788574f66a830515eb8fe11bdc87e1083f04c3f409d095cdde2515c008c2ba32a0554d7e5cda4602c2b20861e5b442e022f3c1be4fd3397c0f9e4d24eae2 trilium-0.59.4.tar.gz