diff --git a/testing/prowlarr/APKBUILD b/testing/prowlarr/APKBUILD index c700d7f62f9..b7bfc11dad6 100644 --- a/testing/prowlarr/APKBUILD +++ b/testing/prowlarr/APKBUILD @@ -1,7 +1,7 @@ # Contributor: Fabricio Silva # Maintainer: Fabricio Silva pkgname=prowlarr -pkgver=1.3.2.3006 +pkgver=1.4.1.3258 pkgrel=0 pkgdesc="Aggregator for usenet index and torrent tracker." url="https://github.com/Prowlarr/Prowlarr" @@ -31,16 +31,16 @@ pkggroups="prowlarr" # map arch to dotnet case $CARCH in -x86_64) _dotnet_arch="x64";; -aarch64) _dotnet_arch="arm64";; -armv7) _dotnet_arch="arm";; -*) _dotnet_arch="$CARCH";; + x86_64) _dotnet_arch="x64" ;; + aarch64) _dotnet_arch="arm64" ;; + armv7) _dotnet_arch="arm" ;; + *) _dotnet_arch="$CARCH" ;; esac # custom variables _runtime="linux-musl-$_dotnet_arch" _framework="net6.0" -_output="$builddir/_output" +_output="_output" _artifacts="$_output/$_framework/$_runtime/publish" prepare() { @@ -50,14 +50,14 @@ prepare() { ulimit -n 4096 # replace version info - local buildprops="$builddir"/src/Directory.Build.props + local buildprops=src/Directory.Build.props sed -i -e "s/[0-9.*]\+<\/AssemblyVersion>/$pkgver<\/AssemblyVersion>/g" "$buildprops" sed -i -e "s/[\$()A-Za-z-]\+<\/AssemblyConfiguration>/master<\/AssemblyConfiguration>/g" "$buildprops" } build() { # build the package - dotnet build "$builddir"/src \ + dotnet build src \ -p:RuntimeIdentifiers="$_runtime" \ -p:Configuration=Release \ -p:SelfContained=false \ @@ -71,8 +71,8 @@ build() { # build web ui export BROWSERSLIST_IGNORE_OLD_DATA=true - yarn --cwd "$builddir" install --frozen-lockfile --network-timeout 120000 - yarn --cwd "$builddir" build --env production --no-stats + yarn install --frozen-lockfile --network-timeout 120000 + yarn build --env production --no-stats # move web ui to artifacts folder mv "$_output"/UI "$_artifacts" @@ -83,7 +83,7 @@ package() { # use package_info to disable update feature install -Dm644 "$srcdir"/package_info "$DESTDIR"/package_info - echo "PackageVersion=$pkgver-$pkgrel" >>"$DESTDIR"/package_info + echo "PackageVersion=$pkgver-r$pkgrel" >>"$DESTDIR"/package_info cp -af "$_artifacts" "$DESTDIR"/bin chown -R "$pkgusers:$pkggroups" "$DESTDIR" @@ -93,9 +93,9 @@ package() { } sha512sums=" -202a54de39c185bbaa1cb806a17a67c0e58804108663abc7f35e75d0ccd0c1e71a9d6d2aef16c1b3b202231d588261082c1acbb35218f7307cd12e18d716463b prowlarr-1.3.2.3006.tar.gz +d192257d33401bbc3a7b47486a21b6c3d17b850d0668dca44aba4d535fbe671617d425a1d59e1ca56c7ed3a028912afc1cc03f5eb4a2496a9d277df2beb0e7ad prowlarr-1.4.1.3258.tar.gz 753520379a6c5f2899b4ddfd820d5573598a32cb105f74c6fd978a3f2c98895cf709ef2d9afe2bae8c4856da86cb6a1364f5713ea7ef6a36bb21b5a5840c1471 0001-disable-restart.patch -fff211ddbdd5a59858fa28c6a47b1408a8c5d609d5aa4354c6fc94f7b94469cb7933df9094b411dfc8f19257a1bcef87668ff76ed70613cc8dd04f8170f31f81 prowlarr.initd -634e85108e1714a75835d572be783aca6bfe1df7ee0caf587557029a1c27c19e44390e6d325c8d31d50eb249d89445c99928bb84c9b3065abe678f56bea3995e prowlarr.confd +944467713c1fc747b21e731cbadc3c7e6d0e4d65992a989e154f9ff954555e46553aa03398f1f7990bdf972afc2af276d433d504b4745ec96adb7d7c66fb7a7b prowlarr.initd +82085e127eef170c2396076970c01b71c7e627ff3bbbf69fab4b83c59d2bb9a591cb484f8370fb9db5ccc7779545f949de00c25b9fc6aac4dace00f19cb5a2cf prowlarr.confd 67c4dd1cf8259296d994c350dfd3962d23333071889ce0b4ef6b2f4cbb4349490c5dbe4dcc202c99bab7a5c4b7611be56d7c8835b2b13924526c45311db1c3fb package_info " diff --git a/testing/prowlarr/prowlarr.confd b/testing/prowlarr/prowlarr.confd index e138621d62a..53d79a5ca69 100644 --- a/testing/prowlarr/prowlarr.confd +++ b/testing/prowlarr/prowlarr.confd @@ -2,4 +2,5 @@ command_user="prowlarr:prowlarr" # user:group directory="/var/lib/prowlarr" +logdir="/var/log/prowlarr" supervisor="supervise-daemon" diff --git a/testing/prowlarr/prowlarr.initd b/testing/prowlarr/prowlarr.initd index a86cada5f03..88568a673db 100644 --- a/testing/prowlarr/prowlarr.initd +++ b/testing/prowlarr/prowlarr.initd @@ -3,13 +3,17 @@ # fallback values for /etc/conf.d/prowlarr : ${command_user:=prowlarr:prowlarr} : ${directory:=/var/lib/prowlarr} +: ${logdir:=/var/log/prowlarr} name=prowlarr description="Prowlarr daemon" command="/usr/lib/prowlarr/bin/Prowlarr" command_args="-nobrowser -data=$directory" command_background=true + pidfile="/run/$name.pid" +output_log="$logdir/output.log" +error_log="$logdir/error.log" depend() { need net @@ -17,5 +21,6 @@ depend() { } start_pre() { - checkpath -d -o "$command_user" "$directory" + checkpath -d -o "$command_user" "$directory" "$logdir" + checkpath -f -o "$command_user" "$output_log" "$error_log" }