From 522995c7d2314e948b37fd92105d5ceed9c524e8 Mon Sep 17 00:00:00 2001 From: zhanghua000 Date: Thu, 7 Oct 2021 17:39:31 +0800 Subject: [PATCH 1/2] Add config to hide multi user in SDDM --- ArchLinux/.SRCINFO | 7 +++++-- ArchLinux/PKGBUILD | 18 ++++++++++++++---- ArchLinux/multi-gensddmconfig.hook | 10 ++++++++++ ArchLinux/multi-rmsddmconfig.hook | 10 ++++++++++ 4 files changed, 39 insertions(+), 6 deletions(-) create mode 100644 ArchLinux/multi-gensddmconfig.hook create mode 100644 ArchLinux/multi-rmsddmconfig.hook diff --git a/ArchLinux/.SRCINFO b/ArchLinux/.SRCINFO index 71d0f52..cc044d5 100644 --- a/ArchLinux/.SRCINFO +++ b/ArchLinux/.SRCINFO @@ -1,6 +1,6 @@ pkgbase = multiverse-git pkgdesc = A decentralized version control system for peer-to-peer software development. - pkgver = d945c32 + pkgver = 0.0.5.3.g6171b8f pkgrel = 1 url = http://www.multiverse-vcs.com/ arch = aarch64 @@ -10,7 +10,10 @@ pkgbase = multiverse-git depends = go>=1.16 provides = multiverse source = multiverse-git::git+https://github.com/multiverse-vcs/go-multiverse + source = multi-gensddmconfig.hook + source = multi-rmsddmconfig.hook sha256sums = SKIP + sha256sums = 573122034ce6c0ee969668b85506396f1ad80afed6a5acea0dfb3331516c2a5e + sha256sums = 4986379de5a8dbd5acf04b93b170cb1cd36ff16fd1a1181d6bcf1b7c2db85a3f pkgname = multiverse-git - diff --git a/ArchLinux/PKGBUILD b/ArchLinux/PKGBUILD index 357e9cf..685fac9 100644 --- a/ArchLinux/PKGBUILD +++ b/ArchLinux/PKGBUILD @@ -1,7 +1,7 @@ # Maintainer Keenan Nemetz # Maintainer teknomunk pkgname=multiverse-git -pkgver=abe236f +pkgver=0.0.5.3.g6171b8f pkgrel=1 pkgdesc="A decentralized version control system for peer-to-peer software development." arch=(aarch64 x86_64) @@ -10,8 +10,14 @@ licence=("AGPL3") provides=(multiverse) depends=("go>=1.16") makedepends=("git" "go>=1.16") -source=(${pkgname}::git+https://github.com/multiverse-vcs/go-multiverse) -sha256sums=("SKIP") +source=( + ${pkgname}::git+https://github.com/multiverse-vcs/go-multiverse + multi-gensddmconfig.hook + multi-rmsddmconfig.hook +) +sha256sums=('SKIP' + '573122034ce6c0ee969668b85506396f1ad80afed6a5acea0dfb3331516c2a5e' + '4986379de5a8dbd5acf04b93b170cb1cd36ff16fd1a1181d6bcf1b7c2db85a3f') check(){ export GOPATH=${srcdir}/go @@ -20,7 +26,7 @@ check(){ } pkgver(){ cd ${srcdir}/${pkgname} - git log --format=%h -1 + git describe --tags | sed "s/v//;s/-/./g" } prepare(){ export GOPATH=${srcdir}/go @@ -43,4 +49,8 @@ package(){ chown 5000:5000 ${pkgdir}/var/lib/multi install -Dm644 ${srcdir}/${pkgname}/init/multiverse.service ${pkgdir}/usr/lib/systemd/system/multiverse.service install -Dm644 ${srcdir}/${pkgname}/init/multi-user.conf ${pkgdir}/usr/lib/sysusers.d/multi.conf + # Create SDDM config to hide multi user in SDDM greeter + mkdir -p ${pkgdir}/usr/share/libalpm/hooks + install -Dm644 ${srcdir}/multi-gensddmconfig.hook ${pkgdir}/usr/share/libalpm/hooks/multi-gensddmconfig.hook + install -Dm644 ${srcdir}/multi-rmsddmconfig.hook ${pkgdir}/usr/share/libalpm/hooks/milti-rmssddmconfig.hook } diff --git a/ArchLinux/multi-gensddmconfig.hook b/ArchLinux/multi-gensddmconfig.hook new file mode 100644 index 0000000..95e16de --- /dev/null +++ b/ArchLinux/multi-gensddmconfig.hook @@ -0,0 +1,10 @@ +[Trigger] +Type = Package +Operation = Install +Operation = Upgrade +Target = multiverse-git + +[Action] +Description = Trying to create SDDM config to hide multi user... +When = PostTransaction +Exec = /usr/bin/sh -c "which sddm-greeter > /dev/null; if [ $? -eq 0 ]; then mkdir -p /etc/sddm.conf.d && echo [Users] > /etc/sddm.conf.d/multi.conf && echo HideUsers=multi >> /etc/sddm.conf.d/multi.conf; fi" diff --git a/ArchLinux/multi-rmsddmconfig.hook b/ArchLinux/multi-rmsddmconfig.hook new file mode 100644 index 0000000..580b81d --- /dev/null +++ b/ArchLinux/multi-rmsddmconfig.hook @@ -0,0 +1,10 @@ +[Trigger] +Type = Package +Operation = Remove +Target = multiverse-git + +[Action] +Description = Removing SDDM config generated by multiverse... +When = PreTransaction +Exec = /usr/bin/sh -c "rm -f /etc/sddm.conf.d/multi.conf > /dev/null" + From 9ebf1d005aea3ac3ed30ddd8df5fc78ce960ff0e Mon Sep 17 00:00:00 2001 From: Noob Zhang Date: Sat, 5 Mar 2022 20:48:28 +0800 Subject: [PATCH 2/2] No need to set go as runtime dependencies --- ArchLinux/PKGBUILD | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/ArchLinux/PKGBUILD b/ArchLinux/PKGBUILD index 685fac9..e25efca 100644 --- a/ArchLinux/PKGBUILD +++ b/ArchLinux/PKGBUILD @@ -2,13 +2,12 @@ # Maintainer teknomunk pkgname=multiverse-git pkgver=0.0.5.3.g6171b8f -pkgrel=1 +pkgrel=2 pkgdesc="A decentralized version control system for peer-to-peer software development." arch=(aarch64 x86_64) url=http://www.multiverse-vcs.com/ licence=("AGPL3") provides=(multiverse) -depends=("go>=1.16") makedepends=("git" "go>=1.16") source=( ${pkgname}::git+https://github.com/multiverse-vcs/go-multiverse