diff --git a/Kyoo/Views/WebClient b/Kyoo/Views/WebClient index 2201028d..45976671 160000 --- a/Kyoo/Views/WebClient +++ b/Kyoo/Views/WebClient @@ -1 +1 @@ -Subproject commit 2201028d9fd234dac81d1f0fcaac3793463cba46 +Subproject commit 459766717070ee420c933923727c1e9816b7ddd6 diff --git a/Kyoo/kyoo.sh b/Kyoo/kyoo.sh deleted file mode 100644 index b614af45..00000000 --- a/Kyoo/kyoo.sh +++ /dev/null @@ -1,4 +0,0 @@ -#!/usr/bin/bash - -cd /opt/kyoo || exit 1 -dotnet Kyoo.dll \ No newline at end of file diff --git a/Makefile b/Makefile deleted file mode 100644 index 2ee5a44b..00000000 --- a/Makefile +++ /dev/null @@ -1,33 +0,0 @@ -NEEDED = dotnet \ - cmake \ - gcc \ - node \ - npm - -ECHO = @echo -e -COL = \033[1;36m -RED = \033[1;31m -NOCOL = \033[0m - - -all: dependencies - -dependencies: - @for pkg in $(NEEDED); do \ - $$pkg --version >> /dev/null 2>&1 || ($(ECHO) "$(RED)ERROR: $$pkg could not be found.$(NOCOL)"; exit 1); \ - done - -install_kyoo: all - $(ECHO) "$(COL)Building the app$(NOCOL)" - @if ! [[ $$(mkdir --parent /opt/kyoo) -eq 0 && -w /opt/kyoo ]]; then echo -e "$(RED)You don't have permissions to install Kyoo. Try to re run with sudo privileges.$(NOCOL)"; exit 1; fi - dotnet publish -c Release -o /opt/kyoo Kyoo/Kyoo.csproj - id -u kyoo &> /dev/null || useradd -rU kyoo - chown -R kyoo /opt/kyoo - chgrp -R kyoo /opt/kyoo - chmod +x /opt/kyoo/kyoo.sh - -install: install_kyoo - chown -R kyoo /opt/kyoo - chgrp -R kyoo /opt/kyoo - -.PHONY = all dependencies transcoder diff --git a/install.sh b/install.sh deleted file mode 100755 index df9a0936..00000000 --- a/install.sh +++ /dev/null @@ -1,11 +0,0 @@ -#!/bin/bash - -if [[ $(/usr/bin/id -u) -ne 0 ]]; then - echo "The script must be run as root since it create an user for kyoo and install the app inside the /opt folder." - exit -fi - -git clone https://github.com/AnonymusRaccoon/Kyoo --recurse -cd Kyoo -git pull --recurse -make install diff --git a/install/PKGBUILD b/install/PKGBUILD new file mode 100644 index 00000000..82bd35ce --- /dev/null +++ b/install/PKGBUILD @@ -0,0 +1,45 @@ +# Maintainer: Zoe Roux +pkgname=kyoo +pkgver=1.0.0 +pkgrel=1 +epoch= +pkgdesc="A media browser." +arch=("i686" "x86_64" "armv6h") +url="https://github.com/AnonymusRaccoon/Kyoo" +license=("GPLv3") +groups=() +depends=("dotnet-runtime>=3" "aspnet-runtime>=3") +makedepends=("dotnet-sdk>=3" "cmake" "gcc" "make" "npm") +source=("kyoo-$pkgver.tar.gz::https://github.com/AnonymusRaccoon/Kyoo/archive/master.tar.gz" + "trancoder-$pkgver.tar.gz::https://github.com/AnonymusRaccoon/Kyoo.Transcoder/archive/master.tar.gz" + "webapp-$pkgver.tar.gz::https://github.com/AnonymusRaccoon/Kyoo.WebApp/archive/master.tar.gz" + "kyoo.service" + "kyoo.sysusers") +sha256sums=("SKIP" "SKIP" "SKIP" "SKIP" "SKIP") + + +prepare() { + # cd "Kyoo-$pkgver" + # ln -s transcoder "../Kyoo.Transcoder-$pkgver" + # ln -s Kyoo/Views/WebApp "../Kyoo.WebApp-$pkgver" + cd "Kyoo-master" + ln -s transcoder "../Kyoo.Transcoder-master" + ln -s Kyoo/Views/WebApp "../Kyoo.WebApp-master" + +} + +build() { + # cd "Kyoo-$pkgver" + cd "Kyoo-master" + export DOTNET_CLI_TELEMETRY_OPTOUT=1 + dotnet build -c Release Kyoo +} + +package() { + # cd "Kyoo-$pkgver" + cd "Kyoo-master" + mkdir -p "$pkgdir/usr/lib/kyoo" + dotnet publish -c Release -o "$pkgdir/usr/lib/kyoo" Kyoo + install -Dm 644 kyoo.service -t "$pkgdir/usr/lib/systemd/system/" + install -Dm 644 kyoo.sysusers "$pkgdir/usr/lib/sysusers.d/kyoo.conf" +} diff --git a/install/kyoo.service b/install/kyoo.service new file mode 100644 index 00000000..a0ea7435 --- /dev/null +++ b/install/kyoo.service @@ -0,0 +1,13 @@ +[Unit] +Description=Kyoo Media Server +After=network.target + +[Service] +User=kyoo +WorkingDirectory=/usr/lib/kyoo +ExecStart=/usr/bin/dotnet kyoo.dll +Restart=on-abort +TimeoutSec=20 + +[Install] +WantedBy=multi-user.target diff --git a/install/kyoo.sysusers b/install/kyoo.sysusers new file mode 100644 index 00000000..35918eea --- /dev/null +++ b/install/kyoo.sysusers @@ -0,0 +1 @@ +u kyoo - "Kyoo Media Server" /var/lib/kyoo diff --git a/transcoder b/transcoder index 542241fe..e242eb5f 160000 --- a/transcoder +++ b/transcoder @@ -1 +1 @@ -Subproject commit 542241feb932113ea6481f4e49823872fca4f30a +Subproject commit e242eb5f19fcf2c4b10aed5bd96072dd498f9476