diff options
| -rw-r--r-- | .SRCINFO | 5 | ||||
| -rw-r--r-- | PKGBUILD | 16 | ||||
| -rw-r--r-- | nextcloud-client.install | 19 | ||||
| -rw-r--r-- | nextcloud-client.service | 13 |
4 files changed, 8 insertions, 45 deletions
@@ -1,9 +1,8 @@ pkgbase = nextcloud-client-git pkgdesc = Nextloud client for linux - pkgver = 2.3.3 + pkgver = v2.3.3.r15.gb095916 pkgrel = 1 url = https://nextcloud.com/ - install = nextcloud-client.install arch = i686 arch = x86_64 license = GPL2 @@ -27,9 +26,7 @@ pkgbase = nextcloud-client-git options = !strip backup = etc/Nextcloud/sync-exclude.lst source = nextcloud-client::git+https://github.com/nextcloud/client_theming.git - source = nextcloud-client.service sha256sums = SKIP - sha256sums = 590d44296e12dd4389dc2bbd100b1f680f5ef6dee381469748525fd34af32009 pkgname = nextcloud-client-git @@ -1,12 +1,12 @@ # Maintainer: Danilo Kuehn <dk at nogo-software dot de> # Git: https://github.com/nogo/archlinux-pkgbuild -# Uncomment, if you want tha last release -_version=2.3.3 +# Uncomment, if you want the last release +#_version=2.3.3 pkgname=nextcloud-client-git _name=${pkgname/\-git/} -pkgver=2.3.3 +pkgver=v2.3.3.r15.gb095916 pkgrel=1 pkgdesc="Nextloud client for linux" arch=('i686' 'x86_64') @@ -20,22 +20,22 @@ optdepends=( makedepends=('cmake' 'qt5-tools') provides=('mirall' 'mirall-git' 'owncloud-client' 'nextcloud-client') conflicts=('mirall-git' 'owncloud-client' 'owncloud-client-ngs' 'nextcloud-client' 'owncloud-client-git') -install=${_name}.install options=(!strip) backup=('etc/Nextcloud/sync-exclude.lst') source=( "${_name}::git+https://github.com/nextcloud/client_theming.git" - "${_name}.service" ) sha256sums=( 'SKIP' - '590d44296e12dd4389dc2bbd100b1f680f5ef6dee381469748525fd34af32009' ) pkgver() { if [[ -z "${_version}" ]]; then cd ${srcdir}/${_name} - echo $(git rev-list --count HEAD).$(git rev-parse --short HEAD) + ( set -o pipefail + git describe --long 2>/dev/null | sed 's/\([^-]*-g\)/r\1/;s/-/./g' || + printf "r%s.%s" "$(git rev-list --count HEAD)" "$(git rev-parse --short HEAD)" + ) else echo ${_version} fi @@ -68,8 +68,6 @@ package() { cd ${srcdir}/${_name}/build-linux make DESTDIR=${pkgdir} install - install -Dm644 ${srcdir}/${_name}.service ${pkgdir}/usr/lib/systemd/user/${_name}.service - # Fix some naming issues if [ -f ${pkgdir}/usr/share/applications/nextcloud.desktop ]; then sed -Ei 's/Icon(\[.*\])?=nextcloud/Icon\1=Nextcloud/g' ${pkgdir}/usr/share/applications/nextcloud.desktop diff --git a/nextcloud-client.install b/nextcloud-client.install deleted file mode 100644 index 7b3ea262c174..000000000000 --- a/nextcloud-client.install +++ /dev/null @@ -1,19 +0,0 @@ -post_install() { - xdg-icon-resource forceupdate --theme hicolor - systemctl daemon-reload - echo ================================== Important ================================= - echo Start the nextcloud client daemon with: - echo systemctl start --user nextcloud-client.service - echo ============================================================================== - echo Enable the nextcloud client daemon with: - echo systemctl enable --user nextcloud-client.service - echo ============================================================================== -} - -post_upgrade() { - post_install -} - -post_remove() { - post_install -} diff --git a/nextcloud-client.service b/nextcloud-client.service deleted file mode 100644 index 9a97e1b57751..000000000000 --- a/nextcloud-client.service +++ /dev/null @@ -1,13 +0,0 @@ -[Unit] -Description=Nextcloud client - -[Service] -Type=simple -ExecStart=/usr/bin/nextcloud -ExecReload=/bin/kill -HUP $MAINPID -KillMode=process -Restart=on-failure - -[Install] -WantedBy=default.target - |