[arch-commits] Commit in profile-sync-daemon/repos/community-any (4 files)
David Runge
dvzrv at archlinux.org
Wed Sep 23 13:22:25 UTC 2020
Date: Wednesday, September 23, 2020 @ 13:22:24
Author: dvzrv
Revision: 711504
archrelease: copy trunk to community-any
Added:
profile-sync-daemon/repos/community-any/PKGBUILD
(from rev 711503, profile-sync-daemon/trunk/PKGBUILD)
profile-sync-daemon/repos/community-any/profile-sync-daemon.install
(from rev 711503, profile-sync-daemon/trunk/profile-sync-daemon.install)
Deleted:
profile-sync-daemon/repos/community-any/PKGBUILD
profile-sync-daemon/repos/community-any/profile-sync-daemon.install
-----------------------------+
PKGBUILD | 55 +++----
profile-sync-daemon.install | 320 +++++++++++++++++++++---------------------
2 files changed, 188 insertions(+), 187 deletions(-)
Deleted: PKGBUILD
===================================================================
--- PKGBUILD 2020-09-23 13:22:15 UTC (rev 711503)
+++ PKGBUILD 2020-09-23 13:22:24 UTC (rev 711504)
@@ -1,27 +0,0 @@
-# Maintainer: David Runge <dvzrv at archlinux.org>
-# Contributor: graysky <graysky AT archlinux DOT us>
-
-pkgname=profile-sync-daemon
-pkgver=6.40
-pkgrel=1
-pkgdesc="Symlinks and syncs browser profile dirs to RAM"
-arch=('any')
-url="https://github.com/graysky2/profile-sync-daemon"
-license=('MIT')
-depends=('bash' 'findutils' 'inetutils' 'procps-ng' 'rsync' 'systemd')
-optdepends=('zsh-completions: for completion when using zsh')
-install="${pkgname}.install"
-source=("$pkgname-$pkgver.tar.gz::https://github.com/graysky2/$pkgname/archive/v$pkgver.tar.gz")
-sha512sums=('9f2ad3ce426f771a6e7cbaacebfde67a529232fe202eb52d23d37082e503c21d990a2cf43c1124475e5a5c004b00b38d27106b837ce7534ed2b3cc71c49fae82')
-
-build() {
- cd "$pkgname-$pkgver"
- make
-}
-
-package() {
- cd "$pkgname-$pkgver"
- make DESTDIR="$pkgdir/" install
- install -vDm 644 MIT "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE"
- install -vDm 644 README.md -t "${pkgdir}/usr/share/doc/${pkgname}"
-}
Copied: profile-sync-daemon/repos/community-any/PKGBUILD (from rev 711503, profile-sync-daemon/trunk/PKGBUILD)
===================================================================
--- PKGBUILD (rev 0)
+++ PKGBUILD 2020-09-23 13:22:24 UTC (rev 711504)
@@ -0,0 +1,28 @@
+# Maintainer: David Runge <dvzrv at archlinux.org>
+# Contributor: graysky <graysky AT archlinux DOT us>
+
+pkgname=profile-sync-daemon
+pkgver=6.42
+pkgrel=1
+pkgdesc="Symlinks and syncs browser profile dirs to RAM"
+arch=('any')
+url="https://github.com/graysky2/profile-sync-daemon"
+license=('MIT')
+depends=('bash' 'findutils' 'inetutils' 'procps-ng' 'rsync' 'systemd')
+optdepends=('zsh-completions: for completion when using zsh')
+install="${pkgname}.install"
+source=("$pkgname-$pkgver.tar.gz::https://github.com/graysky2/$pkgname/archive/v$pkgver.tar.gz")
+sha512sums=('c7c23187d5badf0f47f66988331bc0fc3f639869a851b17dd6fd894a3c4d01715e6299475664fb93a7c4ad555d1c54553775a504ad9c108a99c6c564de383c33')
+b2sums=('15a0e10e11fc81bd5be181b99691ef8f656016b6b692c6d17ebbd099bbef4da21187243e73a4c3ba5f78172b42e7b1ef585d00aea98e4541222b7d25a8a4b1af')
+
+build() {
+ cd "$pkgname-$pkgver"
+ make
+}
+
+package() {
+ cd "$pkgname-$pkgver"
+ make DESTDIR="$pkgdir/" install
+ install -vDm 644 MIT "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE"
+ install -vDm 644 README.md -t "${pkgdir}/usr/share/doc/${pkgname}"
+}
Deleted: profile-sync-daemon.install
===================================================================
--- profile-sync-daemon.install 2020-09-23 13:22:15 UTC (rev 711503)
+++ profile-sync-daemon.install 2020-09-23 13:22:24 UTC (rev 711504)
@@ -1,160 +0,0 @@
-## arg 1: the new package version
-## arg 2: the old package version
-# shellcheck disable=SC2016
-
-users=$(loginctl --no-legend list-users | awk '{ print $2 }' | sed ':a;N;$!ba;s/\n/ /g')
-
-pre_upgrade() {
- # version 6.00 is a major rebuild
- # yes, I realize that pacman should not stop services but in this case it
- # is required or else browser profiles (user data) can get renamed and confuse
- # people if it does not happen
- if [ "$(vercmp "$2" 6.00)" -lt 0 ]; then
- echo 'Attention: Major changes have been introduced with 6.00+'
- echo 'Instead of a system service a user service is now used.'
- echo 'Only $HOME/.config/psd/psd.conf is used (and automatically created on first start).'
- echo 'To use overlayfs additional setup steps are required (see `man 1 psd`).'
-
- # stop system service now since it will be removed upon updating
- if systemctl is-active psd.service &>/dev/null; then
- systemctl stop psd.service &>/dev/null
- fi
- fi
-
- # version 6.01 redefines the location of tmpfs for the software so it is
- # required that pacman stop the user service here if running
- if [ "$(vercmp "$2" 6.01)" -lt 0 ]; then
- for user in $users; do
- if _psd_running_for_user "$user"; then
- _stop_psd_for_user "$user"
- _diff_recommendation
- fi
- done
- fi
-
- if [ "$(vercmp "$2" 6.03)" -lt 0 ]; then
- for user in $users; do
- HOMEDIR="$(getent passwd "$user" | cut -d: -f6)"
- if [[ -d "$HOMEDIR"/.psd ]]; then
- echo 'The use of $HOME/.psd for configuration is deprecated.'
- echo 'Psd will move it for you upon next invocation to $XDG_CONFIG_HOME/psd'
- fi
- done
-
- # version 6.05 impliments changes to both the service and the way overlayfs is mounted/umount
- # so it is required that pacman stop the user service here if running
- if [ "$(vercmp "$2" 6.05)" -lt 0 ]; then
- for user in $users; do
- if _psd_running_for_user "$user"; then
- _stop_psd_for_user "$user"
- echo 'Users of overlayfs: Before starting the service `psd p` must be run.'
- fi
- done
- fi
- fi
-
- # version 6.07 has minor changes to config file
- if [ "$(vercmp "$2" 6.07)" -lt 0 ]; then
- _diff_recommendation
- fi
-
- # version 6.10 relocates pid file
- if [ "$(vercmp "$2" 6.10)" -lt 0 ]; then
- for user in $users; do
- if _psd_running_for_user "$user"; then
- _stop_psd_for_user "$user"
- fi
- done
- fi
-
- # version 6.14 changes the way overlayfs works
- if [ "$(vercmp "$2" 6.14)" -lt 0 ]; then
- for user in $users; do
- if _psd_running_for_user "$user"; then
- _stop_psd_for_user "$user"
- fi
- done
- fi
-
- # version 6.16 has minor changes to config file
- if [ "$(vercmp "$2" 6.16)" -lt 0 ]; then
- _diff_recommendation
- fi
-
- # version 6.22 has minor changes to config file
- if [ "$(vercmp "$2" 6.22)" -lt 0 ]; then
- _diff_recommendation
- fi
-
- # version 6.30 has minor changes to config file
- if [ "$(vercmp "$2" 6.30)" -lt 0 ]; then
- _diff_recommendation
- fi
-
- # version 6.40 has minor changes to config file
- if [ "$(vercmp "$2" 6.40)" -lt 0 ]; then
- _diff_recommendation
- fi
-}
-
-post_upgrade() {
- # version 6.01 redefines the location of tmpfs for the software so it is
- # required that pacman stop the user service here if running
- if [ "$(vercmp "$2" 6.01)" -lt 0 ]; then
- _daemon_refresh
- fi
-
- # version 6.05 impliments changes to both the service and the way overlayfs is mounted/umount
- # so it is required that pacman stop the user service here if running
- if [ "$(vercmp "$2" 6.05)" -lt 0 ]; then
- _daemon_refresh
- fi
-
- # version 6.10 relocates pid file
- if [ "$(vercmp "$2" 6.10)" -lt 0 ]; then
- _daemon_refresh
- fi
-
- # version 6.11 modified services
- if [ "$(vercmp "$2" 6.11)" -lt 0 ]; then
- _daemon_refresh
- fi
-
- # version 6.14 modified services
- if [ "$(vercmp "$2" 6.14)" -lt 0 ]; then
- _daemon_refresh
- fi
-}
-
-pre_remove() {
- for user in $users; do
- if _psd_running_for_user "$user"; then
- _stop_psd_for_user "$user"
- fi
- done
-}
-
-_daemon_refresh() {
- for i in $users; do
- su "$i" -s /bin/sh -c 'XDG_RUNTIME_DIR=/run/user/$UID systemctl --user daemon-reload'
- done
-}
-
-_psd_running_for_user() {
- running="$(su "$1" -s /bin/sh -c 'XDG_RUNTIME_DIR=/run/user/$UID systemctl --user is-active psd')"
- if [[ "$running" = "active" ]]; then
- return 0
- else
- return 1
- fi
-}
-
-_stop_psd_for_user() {
- echo "In order to preserve the browser profiles, all psd user services will be stopped."
- echo "Any running and managed browsers will be exited."
- su "$1" -s /bin/sh -c 'XDG_RUNTIME_DIR=/run/user/$UID systemctl --user stop psd.service'
-}
-
-_diff_recommendation() {
- echo 'It is recommend to diff /usr/share/psd/psd.conf against ~/.config/psd/psd.conf'
-}
Copied: profile-sync-daemon/repos/community-any/profile-sync-daemon.install (from rev 711503, profile-sync-daemon/trunk/profile-sync-daemon.install)
===================================================================
--- profile-sync-daemon.install (rev 0)
+++ profile-sync-daemon.install 2020-09-23 13:22:24 UTC (rev 711504)
@@ -0,0 +1,160 @@
+## arg 1: the new package version
+## arg 2: the old package version
+# shellcheck disable=SC2016
+
+users=$(loginctl --no-legend list-users | awk '{ print $2 }' | sed ':a;N;$!ba;s/\n/ /g')
+
+pre_upgrade() {
+ # version 6.00 is a major rebuild
+ # yes, I realize that pacman should not stop services but in this case it
+ # is required or else browser profiles (user data) can get renamed and confuse
+ # people if it does not happen
+ if [ "$(vercmp "$2" 6.00)" -lt 0 ]; then
+ echo 'Attention: Major changes have been introduced with 6.00+'
+ echo 'Instead of a system service a user service is now used.'
+ echo 'Only $HOME/.config/psd/psd.conf is used (and automatically created on first start).'
+ echo 'To use overlayfs additional setup steps are required (see `man 1 psd`).'
+
+ # stop system service now since it will be removed upon updating
+ if systemctl is-active psd.service &>/dev/null; then
+ systemctl stop psd.service &>/dev/null
+ fi
+ fi
+
+ # version 6.01 redefines the location of tmpfs for the software so it is
+ # required that pacman stop the user service here if running
+ if [ "$(vercmp "$2" 6.01)" -lt 0 ]; then
+ for user in $users; do
+ if _psd_running_for_user "$user"; then
+ _stop_psd_for_user "$user"
+ _diff_recommendation
+ fi
+ done
+ fi
+
+ if [ "$(vercmp "$2" 6.03)" -lt 0 ]; then
+ for user in $users; do
+ HOMEDIR="$(getent passwd "$user" | cut -d: -f6)"
+ if [[ -d "$HOMEDIR"/.psd ]]; then
+ echo 'The use of $HOME/.psd for configuration is deprecated.'
+ echo 'Psd will move it for you upon next invocation to $XDG_CONFIG_HOME/psd'
+ fi
+ done
+
+ # version 6.05 impliments changes to both the service and the way overlayfs is mounted/umount
+ # so it is required that pacman stop the user service here if running
+ if [ "$(vercmp "$2" 6.05)" -lt 0 ]; then
+ for user in $users; do
+ if _psd_running_for_user "$user"; then
+ _stop_psd_for_user "$user"
+ echo 'Users of overlayfs: Before starting the service `psd p` must be run.'
+ fi
+ done
+ fi
+ fi
+
+ # version 6.07 has minor changes to config file
+ if [ "$(vercmp "$2" 6.07)" -lt 0 ]; then
+ _diff_recommendation
+ fi
+
+ # version 6.10 relocates pid file
+ if [ "$(vercmp "$2" 6.10)" -lt 0 ]; then
+ for user in $users; do
+ if _psd_running_for_user "$user"; then
+ _stop_psd_for_user "$user"
+ fi
+ done
+ fi
+
+ # version 6.14 changes the way overlayfs works
+ if [ "$(vercmp "$2" 6.14)" -lt 0 ]; then
+ for user in $users; do
+ if _psd_running_for_user "$user"; then
+ _stop_psd_for_user "$user"
+ fi
+ done
+ fi
+
+ # version 6.16 has minor changes to config file
+ if [ "$(vercmp "$2" 6.16)" -lt 0 ]; then
+ _diff_recommendation
+ fi
+
+ # version 6.22 has minor changes to config file
+ if [ "$(vercmp "$2" 6.22)" -lt 0 ]; then
+ _diff_recommendation
+ fi
+
+ # version 6.30 has minor changes to config file
+ if [ "$(vercmp "$2" 6.30)" -lt 0 ]; then
+ _diff_recommendation
+ fi
+
+ # version 6.40 has minor changes to config file
+ if [ "$(vercmp "$2" 6.40)" -lt 0 ]; then
+ _diff_recommendation
+ fi
+}
+
+post_upgrade() {
+ # version 6.01 redefines the location of tmpfs for the software so it is
+ # required that pacman stop the user service here if running
+ if [ "$(vercmp "$2" 6.01)" -lt 0 ]; then
+ _daemon_refresh
+ fi
+
+ # version 6.05 impliments changes to both the service and the way overlayfs is mounted/umount
+ # so it is required that pacman stop the user service here if running
+ if [ "$(vercmp "$2" 6.05)" -lt 0 ]; then
+ _daemon_refresh
+ fi
+
+ # version 6.10 relocates pid file
+ if [ "$(vercmp "$2" 6.10)" -lt 0 ]; then
+ _daemon_refresh
+ fi
+
+ # version 6.11 modified services
+ if [ "$(vercmp "$2" 6.11)" -lt 0 ]; then
+ _daemon_refresh
+ fi
+
+ # version 6.14 modified services
+ if [ "$(vercmp "$2" 6.14)" -lt 0 ]; then
+ _daemon_refresh
+ fi
+}
+
+pre_remove() {
+ for user in $users; do
+ if _psd_running_for_user "$user"; then
+ _stop_psd_for_user "$user"
+ fi
+ done
+}
+
+_daemon_refresh() {
+ for i in $users; do
+ su "$i" -s /bin/sh -c 'XDG_RUNTIME_DIR=/run/user/$UID systemctl --user daemon-reload'
+ done
+}
+
+_psd_running_for_user() {
+ running="$(su "$1" -s /bin/sh -c 'XDG_RUNTIME_DIR=/run/user/$UID systemctl --user is-active psd')"
+ if [[ "$running" = "active" ]]; then
+ return 0
+ else
+ return 1
+ fi
+}
+
+_stop_psd_for_user() {
+ echo "In order to preserve the browser profiles, all psd user services will be stopped."
+ echo "Any running and managed browsers will be exited."
+ su "$1" -s /bin/sh -c 'XDG_RUNTIME_DIR=/run/user/$UID systemctl --user stop psd.service'
+}
+
+_diff_recommendation() {
+ echo 'It is recommend to diff /usr/share/psd/psd.conf against ~/.config/psd/psd.conf'
+}
More information about the arch-commits
mailing list