Merge updates from master

This commit is contained in:
Repository mirror & CI
2025-03-13 14:03:18 +00:00
14 changed files with 223 additions and 2305 deletions

View File

@@ -1,3 +1,3 @@
DIST pulumi-v3.152.0-linux-x64.tar.gz 87385748 BLAKE2B d4911d397773f1e6bcb92c6769e8cd3c21a86b4ee3e83c9408c898f706683d099cc5f0c292606c1564937f7033bee28be5a4ccf24190ef896437b4b2278a0b9c SHA512 17f69b94b2978e74955a00a4b1febad4df3266692a863cbaf198a8ee9ca4e073506e2da76ef1773dbe6ed4f77b819b71159d9336875628737e1adc4e1130be3b
DIST pulumi-v3.153.1-linux-x64.tar.gz 87394236 BLAKE2B 8ef52de966e338663b687cbd9cdb173aace545ee85c4f6aac761524e59487bdd73586c1d0370298aa3dfc37ff605311fa8cf43702b793d9047c28d7d9a9ce1ae SHA512 e4e0b0ce4ba79b82e98c2cd116080825d9a31f9c3ae99b818a94304a826d8b6a81ceed5b9306bd7daf958227934bc4952207adb93e78ef9eb5e5ac90ad656728
DIST pulumi-v3.154.0-linux-x64.tar.gz 88117938 BLAKE2B 299cd4112909318ac54947b9fa6bd7c79f7dd356532705b735836c1efa52befe5372999e4cdcd845baa0988ad74f1a1c4ec64184eadb91027ce68221403d8bb4 SHA512 eb4819211b69825609511aea51995f5bf3b3a65a89ed0190b280ba4b4d16263f0884f098db06d2cf9c38eb750da07f5deb112afc167099cfba977ff5472e370b
DIST pulumi-v3.155.0-linux-x64.tar.gz 89948137 BLAKE2B 12cf366b4414cecc5ca0c02031a309c57e69c745edd72948e05d589651cd204e75524abf202134ebcc50869b61726990a8a516764a99182e7dc2f89b1882db82 SHA512 89dff5ea9c0579a3be715f27769f4aa485b4b063ae3f26c377e83c60ce40152564252cfff8110a598c24eb5ba920b1dc95db97524a3eeb31e5da555d5de25f73

View File

@@ -11,4 +11,4 @@ RestartSec=3
Environment="PATH=$PATH"
[Install]
WantedBy=default.target
WantedBy=multi-user.target

View File

@@ -1,2 +1,2 @@
DIST mir-2.19.2.tar.gz 6811003 BLAKE2B 012ad7852974c88abba53e98f5fed3e8f2873f3ad5c3ba8a89c1b43ac67a9871cb7b1eba0034dacb5bd5a410dc931f03290096c9e31020c312788f55b2e851fd SHA512 99e5b09e3321b51bfd9427d778b5983b5a62628648b927c64bacfccb2a757f4c0db4664aaf3b87614472837c9434351681cdae42221b3760c8f947e2895712c2
DIST mir-2.19.3.tar.gz 6811167 BLAKE2B a22a99a409afbc37e716f0128ef15d42eda172df872727d1baceb16bfc6073a4f82a7f70c4a4eeee34242971af5ac0b7efa007a185cbf6b42a0f5201467534f6 SHA512 c6b8c5c5462be17f3edc54cc93e970d3425ca5b3b44b74ac196175bbb60eb95d610be6addf6eb7a6d72a662573ca1d62aa2f396d14ce69d29ec5670d87db650b
DIST mir-2.20.0.tar.gz 6823240 BLAKE2B 6e707155764a3e37d2d5f431902358f3813b1dcad3c6772d13c867b998ffc0df3396c4ac6dca1c59b7c0edd723fc1ca509993e075837e5c666bcbed2d5484299 SHA512 97d743ab183563fcaad7afea1cdc7709636fde5f1c9fda699144f41f1b363c2238364a795961a931eea81abd02b87dcc96b4b1f7e89095ed128eaaa44fbb3005

View File

@@ -0,0 +1,40 @@
Prevent test libraries from being installed and remove tests that lack dependencies to build.
--- a/tests/CMakeLists.txt
+++ b/tests/CMakeLists.txt
@@ -173,6 +173,7 @@ configure_file(
@ONLY
)
+if(0)
install(TARGETS mir-test-assist
ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR}
)
@@ -200,6 +201,7 @@ install(FILES ${CMAKE_CURRENT_BINARY_DIR}/mirtest.pc
install(FILES ${CMAKE_CURRENT_BINARY_DIR}/mirtest-internal.pc
DESTINATION ${CMAKE_INSTALL_LIBDIR}/pkgconfig
)
+endif()
mir_add_memcheck_test()
mir_add_detect_fd_leaks_test()
--- a/tests/mir_test_framework/CMakeLists.txt
+++ b/tests/mir_test_framework/CMakeLists.txt
@@ -55,7 +55,6 @@ add_library(mir-public-test-framework OBJECT
${PROJECT_SOURCE_DIR}/tests/include/mir_test_framework/open_wrapper.h
test_server.cpp ${PROJECT_SOURCE_DIR}/include/test/miral/test_server.h
test_display_server.cpp ${PROJECT_SOURCE_DIR}/include/test/miral/test_display_server.h
- test_wlcs_display_server.cpp ${PROJECT_SOURCE_DIR}/include/test/miral/test_wlcs_display_server.h
${PROJECT_SOURCE_DIR}/tests/include/mir_test_framework/mmap_wrapper.h
mmap_wrapper.cpp
window_management_test_harness.cpp ${PROJECT_SOURCE_DIR}/tests/include/mir_test_framework/window_management_test_harness.h
@@ -183,8 +182,10 @@ set_target_properties(
LINK_FLAGS "-Wl,--version-script,${server_symbol_map}"
)
+if(0)
install(TARGETS mirplatformgraphicsstub LIBRARY DESTINATION ${MIR_SERVER_PLATFORM_PATH})
install(TARGETS mirplatforminputstub LIBRARY DESTINATION ${MIR_SERVER_PLATFORM_PATH})
+endif()
add_library(
mirplatformgraphicsthrow MODULE

View File

@@ -1,4 +1,4 @@
# Copyright 2024 Gentoo Authors
# Copyright 2024-2025 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=8
@@ -53,6 +53,7 @@ BDEPEND="
PATCHES=(
# bug 932786
"${FILESDIR}/${PN}-2.17.0-remove-debug-flags.patch"
"${FILESDIR}/${P}-remove-tests.patch"
)
src_prepare() {
@@ -79,12 +80,3 @@ src_configure() {
)
cmake_src_configure
}
src_install() {
cmake_src_install
if use test; then
# remove dummy libraries
rm -f "${ED}/usr/$(get_libdir)/mir/server-platform/"{graphics-dummy.so,input-stub.so} || die
fi
}

View File

@@ -1,9 +1,9 @@
DIST blocky-0.22-deps.tar.xz 163869124 BLAKE2B e98614feaeb11604866d08003147871096c993cdb90c85bba46ea999a339570ca1500a80bddee202595372ec5d22baa6ec0345d8cf50ffee6d61dd8d6495d49f SHA512 883e5dd66cf974c6d8c73a94c7677d5003ceb7a3ba68001c2d9d36e1e4d1ea64f0818d30240fe77f192ad3f95ede93127bed9adc9647da07a9b9bebc958ffd33
DIST blocky-0.22-docs.tar.gz 5639822 BLAKE2B e177790deb7493f84d8217661e4e4296004a9db7e00ff8d37dbd3c4ed8b7ba0a7cf431067c103f25784e46ca7a8bf80532cdd8f305f3e4ce119890027f0eb186 SHA512 3eed0ff726479826fbefb4140c36bb26825124134d1fbbecf74a31b2fbdde993630adc645ea2e582ce8d415736cc85b20f64a835c87da98700b715c03d368e75
DIST blocky-0.22.tar.gz 712644 BLAKE2B d74881026421337a0fc32a6af2cf6bff736e0130ac599cd80714f0cafff1e81864e0327bc773f8377106421642cf545b76407fca94f07425c428ff8512a7113b SHA512 928ba882cb567f80b9b00c1ab74ba2fba0324b9e5fb6439789d50d8fd438a26f84772d36f91ef9c3a2351c798a399c15aa1b69927a2da11795edd576b7bae6a4
DIST blocky-0.23-deps.tar.xz 191529448 BLAKE2B fbad27f70b73832e0862b32267be0e9956c39c570f4e8d16be6a1b7eaa8ea779df52d1da533486d2b0d3e5b163602b62283ac006de4adc0861ec208fd9f50bd8 SHA512 89441e8082260b7c8a850b91029540554fc8af4bdba1996adb07ff57781c0e92ee439b915cd1473d16fba9bd31612b6c267c2fe6f96096a4f9ed4fa23d46165d
DIST blocky-0.23-docs.tar.gz 6773940 BLAKE2B 8114e49c8c8b7c01a1376dd0ef15b5eee966fc18c84d8645aa91c3524876167de810a17d63f2e287a3fe4c56906076783e135cf0c209886870588f40190e9d78 SHA512 aec00c88ea97f7f2d145020e666f77f992b53cd8867d4d4c5bc5a094b06889c35d7019d0e491fe02fb1dd803912613ec7f874f4d7a9f0d06e41c7bb8c609d956
DIST blocky-0.23.tar.gz 7236537 BLAKE2B 4dd8b4a9587ed2b768ff2cf8809e14242032d7e8be3d3c422eb5518df33c32c0f767ba8e7490f353e81ede8c150cf3175621ea35ad3aa682f62c7d169c511b63 SHA512 22431da4c2f259411b7eb790e8f05a7264d0aa96fe4774722bbe71cf9459a3ed7f434b4b295c95b80f2efc6de55ff645f860443838fe793bc413d74b77e395be
DIST blocky-0.24-deps.tar.xz 5931984 BLAKE2B 834f637649051cd84950bfa2cf80e2e41972e746900dc86a5ca933a17eb4e15d75ab3813e3ddc02ec53945b1114a4ac2624535ca80210df479e254e1483122c0 SHA512 ac5b371a037429b5e51ced17434ac168895cb33e41f876ba286a3fd4d0ec779f68355603c0eeaa6f09c55eb552922257f8d27c409e661b5f9ebbe240c7a6ea57
DIST blocky-0.24-docs.tar.gz 7335085 BLAKE2B 094686354b65b8b95391c5381790c6ee6198475155dc80099d3adcb7e3ee6598d0ec4a191a15d1c3a745d9ac6e4290bc048747ef551c9d07c5cf740dee3a922b SHA512 c4151e1903945d9396c341927178e6cd4e0a82be5899f610be1746a14e1c3b4c315850cc2f6e00ec248e3a8ba2428e2f8ec0e7ddcaf936af177cb064c4edbaf4
DIST blocky-0.24.tar.gz 7246810 BLAKE2B ec6ddbdab6f77f039e5b79e4092239ae17b003659e02bcf4d81a6371be5e5f3c9f5cc071b3a2b8ad6d0a5cc11834da5ef618445288ba1f3ae8306f8629931cbf SHA512 d89e417157a2f45232f264eed597849bf38e4ad7407d215e5ebe9b2bd84e2b31f1c434b9df915c295272214a3398fb73302814503bca5ca41b748363ecc656e6
DIST blocky-0.25-deps.tar.xz 6060720 BLAKE2B 1cb52169ba9e23c209ca9af4ef7199491dd0844342cd6baf6ca01db71ac03a5b94866356417627eb21ff644602d93344fd6666d5d0ffbbe578be8d300eb3d882 SHA512 1cbc8c12b71ab0cd81d86a0ce3e1466ac80d3ae1ec842f73f3de60d40fff84fb89f22d7aa6a0b75e5f725e2b12a614d27290c62ae192fb2746d847ff59192369
DIST blocky-0.25-docs.tar.gz 8494233 BLAKE2B 1ed628a51d2baefa0926131aa533385aa83e1113252532ba8a58782cd33a018f0813c78284949dd67ed366d2a166cdf2866aef70fb1631bd42376b129d35bb60 SHA512 443bffd1f142286405a281895ecab01d37306fd68e754f977b6da71648c784fcbb9f45161e8c2403bf032a40a8d3ff3884dfbd578650a70eceed20624df8b8cc
DIST blocky-0.25.tar.gz 7253485 BLAKE2B 64b650e17370f79a97e420737e8df2a5a733c5d52a037d1b7c37d25d042e6a237f84e787b8230bb7c95a6ee085978107403afd1896f9b7a7318ed08c2a2fce12 SHA512 77fefcf6936c10a7d8b4b27ce5447ad6b2b15637337a7d0a9256c19cf893e3b32c5843236e30c9b302fb3c9fa69c73a82ea1e4ad33162ac3a07913215771d4f9

View File

@@ -1,4 +1,4 @@
# Copyright 1999-2024 Gentoo Authors
# Copyright 1999-2025 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=8
@@ -72,7 +72,8 @@ src_compile() {
src_test() {
# mimcking make test
ego run github.com/onsi/ginkgo/v2/ginkgo --label-filter="!e2e" --coverprofile=coverage.txt --covermode=atomic --cover -r -p
ego run github.com/onsi/ginkgo/v2/ginkgo --label-filter="!e2e" --coverprofile=coverage.txt --covermode=atomic \
--cover -r -p
ego tool cover -html coverage.txt -o coverage.html
}

View File

@@ -1,4 +1,4 @@
# Copyright 1999-2024 Gentoo Authors
# Copyright 1999-2025 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=8
@@ -72,7 +72,8 @@ src_compile() {
src_test() {
# mimcking make test
ego run github.com/onsi/ginkgo/v2/ginkgo --label-filter="!e2e" --coverprofile=coverage.txt --covermode=atomic --cover -r -p
ego run github.com/onsi/ginkgo/v2/ginkgo --label-filter="!e2e" --coverprofile=coverage.txt --covermode=atomic \
--cover -r -p
ego tool cover -html coverage.txt -o coverage.html
}

View File

@@ -1,4 +1,4 @@
# Copyright 1999-2024 Gentoo Authors
# Copyright 1999-2025 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=8
@@ -8,7 +8,7 @@ inherit fcaps go-module systemd shell-completion
DESCRIPTION="Fast and lightweight DNS proxy as ad-blocker with many features written in Go"
HOMEPAGE="https://github.com/0xERR0R/blocky/"
DOCUMENTATION_COMMIT=9c6a86eb163e758686c5d6d4d5259deb086a8aa9
DOCUMENTATION_COMMIT=d58f16a83c51f47ed033a8447527fd6e7b9af135
if [[ ${PV} == 9999* ]]; then
inherit git-r3
@@ -19,7 +19,7 @@ else
https://github.com/rahilarious/gentoo-distfiles/releases/download/${P}/deps.tar.xz -> ${P}-deps.tar.xz
doc? ( https://github.com/0xERR0R/blocky/archive/${DOCUMENTATION_COMMIT}.tar.gz -> ${P}-docs.tar.gz )
"
KEYWORDS="~amd64"
KEYWORDS="~amd64 ~arm64"
fi
# main
@@ -29,16 +29,16 @@ LICENSE+=" AGPL-3 BSD-2 BSD ISC MIT MPL-2.0"
SLOT="0"
IUSE="doc"
# RESTRICT="test"
RESTRICT="test"
RDEPEND="
acct-user/blocky
acct-group/blocky
"
PATCHES=(
"${FILESDIR}"/disable-failed-tests-0.22.patch
)
# PATCHES=(
# "${FILESDIR}"/disable-failed-tests-0.22.patch
# )
FILECAPS=(
-m 755 'cap_net_bind_service=+ep' usr/bin/"${PN}"
@@ -54,12 +54,12 @@ src_unpack() {
git-r3_src_unpack
fi
else
go-module_src_unpack
default
fi
}
src_compile() {
[[ ${PV} != 9999* ]] && export VERSION="${PV}"
[[ ${PV} != 9999* ]] && { export VERSION="${PV}" && ln -sv ../vendor ./ || die ; }
# mimicking project's Dockerfile
emake GO_SKIP_GENERATE=yes GO_BUILD_FLAGS="-tags static -v " build
@@ -72,7 +72,8 @@ src_compile() {
src_test() {
# mimcking make test
ego run github.com/onsi/ginkgo/v2/ginkgo --label-filter="!e2e" --coverprofile=coverage.txt --covermode=atomic --cover -r -p
ego run github.com/onsi/ginkgo/v2/ginkgo --label-filter="!e2e" --coverprofile=coverage.txt --covermode=atomic \
--cover -r -p
ego tool cover -html coverage.txt -o coverage.html
}

View File

@@ -1,4 +1,4 @@
# Copyright 1999-2024 Gentoo Authors
# Copyright 1999-2025 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=8
@@ -8,7 +8,7 @@ inherit fcaps go-module systemd shell-completion
DESCRIPTION="Fast and lightweight DNS proxy as ad-blocker with many features written in Go"
HOMEPAGE="https://github.com/0xERR0R/blocky/"
DOCUMENTATION_COMMIT=8c38c181ca6600328847f3c9856df99b0c3ad04b
DOCUMENTATION_COMMIT=d58f16a83c51f47ed033a8447527fd6e7b9af135
if [[ ${PV} == 9999* ]]; then
inherit git-r3
@@ -72,7 +72,8 @@ src_compile() {
src_test() {
# mimcking make test
ego run github.com/onsi/ginkgo/v2/ginkgo --label-filter="!e2e" --coverprofile=coverage.txt --covermode=atomic --cover -r -p
ego run github.com/onsi/ginkgo/v2/ginkgo --label-filter="!e2e" --coverprofile=coverage.txt --covermode=atomic \
--cover -r -p
ego tool cover -html coverage.txt -o coverage.html
}

File diff suppressed because it is too large Load Diff

View File

@@ -1,2 +1,4 @@
DIST MullvadVPN-2025.4_aarch64.rpm 84730077 BLAKE2B 3366b8e041f2d298b53f8b04f97fc483ff3982d983f64ba88da3db8121dd24ce12dffc497d4b8d92b1b75a4830987ddf198417211c00056094c8fcf09ef3615e SHA512 e54ac6393253d2a536aca671a66c2a1b9e0b7540e69ee1743689e770fbea2d32bd8fedea2a35f2fccd962f5bc7664ee5f1551a2f120fd8095dbec270298202b1
DIST MullvadVPN-2025.4_x86_64.rpm 90398321 BLAKE2B ec68991ef26e3c3a68391a54165eafe85cae56fb5210485c8b88ba1925cc0cc097a70945f75c77e5c4ab38f058466f93b96c9b7e878a508b85e38241ac2794ed SHA512 af5db62b4bee13cbd9444b3316d59646c7c978214db36a1b2a64de06dc4765bffdab2037e57d41906370505e5ca0b36211f73f85b0bca3881fcdafa1fd50e877
DIST MullvadVPN-2025.5-beta1_aarch64.rpm 83182669 BLAKE2B 96ebdf263c4e8115c3af417bd17823324a545de8b3883f8757457bcbeb53cc6fb5346c1e7174e79bd528543d553840bf550e4212c2bd4f5ab20c49a8f8ddbb39 SHA512 1066a8b872182b198b618e992379c3beb6cd07bc8da0832a18bbea7f5d7d0e12e668d3b89352d1e860af32d994dc0bb8074f3ebb9230a7d30e12d41f6515b2ee
DIST MullvadVPN-2025.5-beta1_x86_64.rpm 88593697 BLAKE2B 01af37045df39d1ad8458e2da6b2dcdf8c332a154676060111faefdab0872882d6126a7a7c007a0e00db65e8c20648f28e212caedf827c0d85f32ffda1b9d5ea SHA512 fcb33f977a92b1ab539dd770a0b0974d73a3772062224f9c52f7f91afb76d78c1d4a270eb32fe8b3043cee13119fc6e6989eddab5d34790237eb0be613752775

View File

@@ -0,0 +1,152 @@
# Copyright 1999-2025 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=8
inherit desktop rpm systemd shell-completion xdg
MYPV="${PV/_beta/-beta}"
DESCRIPTION="Tool used to manage daemon setup"
HOMEPAGE="https://github.com/mullvad/mullvadvpn-app https://mullvad.net/"
SRC_URI="
amd64? ( https://github.com/mullvad/mullvadvpn-app/releases/download/${MYPV}/MullvadVPN-${MYPV}_x86_64.rpm )
arm64? ( https://github.com/mullvad/mullvadvpn-app/releases/download/${MYPV}/MullvadVPN-${MYPV}_aarch64.rpm )
"
S="${WORKDIR}"
LICENSE="GPL-3"
SLOT="0"
KEYWORDS=""
RESTRICT="bindist mirror strip"
RDEPEND="
app-accessibility/at-spi2-core:2
dev-libs/expat
dev-libs/glib:2
dev-libs/nspr
dev-libs/nss
media-libs/alsa-lib
media-libs/mesa
net-print/cups
sys-apps/dbus
x11-libs/cairo
x11-libs/gtk+:3
x11-libs/libdrm
x11-libs/libX11
x11-libs/libxcb
x11-libs/libXcomposite
x11-libs/libXdamage
x11-libs/libXext
x11-libs/libXfixes
x11-libs/libxkbcommon
x11-libs/libXrandr
x11-libs/pango
"
QA_PREBUILT="*"
src_install() {
sed -i "s|SCRIPT_DIR=.*|SCRIPT_DIR=\"/opt/Mullvad VPN/\"|g" "${S}/opt/Mullvad VPN/mullvad-vpn" || die
# Using doins -r would strip executable bits from all binaries
cp -pPR opt "${D}"/ || die "Failed to copy files"
fperms +x "/opt/Mullvad VPN/chrome_crashpad_handler"
fperms 4755 "/opt/Mullvad VPN/chrome-sandbox"
dobin ./usr/bin/mullvad
dobin ./usr/bin/mullvad-daemon
dobin ./usr/bin/mullvad-exclude
dosym -r "/opt/Mullvad VPN/mullvad-vpn" /usr/bin/mullvad-vpn
dosym -r "/opt/Mullvad VPN/resources/mullvad-problem-report" /usr/bin/mullvad-problem-report
# mullvad-exclude uses cgroups to manage exclusions, which requires root permissions, but is
# also most often used to exclude graphical applications which can't or shouldn't run as root
# (i.e., can't be run under `sudo/doas /usr/bin/mullvad-exclude ...`, because `sudo`/`doas`
# change user). The setuid bit allows any user to exclude executables under their own UID.
fperms 4755 /usr/bin/mullvad-exclude
newinitd "${FILESDIR}"/mullvad-daemon.initd mullvad-daemon
systemd_newunit ./usr/lib/systemd/system/mullvad-daemon.service mullvad-daemon.service
systemd_newunit ./usr/lib/systemd/system/mullvad-early-boot-blocking.service mullvad-early-boot-blocking.service
newbashcomp ./usr/share/bash-completion/completions/mullvad mullvad
newfishcomp ./usr/share/fish/vendor_completions.d/mullvad.fish mullvad
newzshcomp ./usr/share/zsh/site-functions/_mullvad _mullvad
domenu ./usr/share/applications/mullvad-vpn.desktop
local x
for x in 16 32 48 64 128 256 512 1024; do
doicon -s "${x}" "./usr/share/icons/hicolor/${x}x${x}/apps/mullvad-vpn.png"
done
}
MULLVAD_IS_BEING_UPDATED=false
pkg_preinst() {
xdg_pkg_preinst
[[ -n "$(best_version "${CATEGORY}/${PN}")" ]] && MULLVAD_IS_BEING_UPDATED=true
}
pkg_postrm() {
xdg_pkg_postrm
if [[ ${MULLVAD_IS_BEING_UPDATED} = "false" ]]; then
if ! command -v pgrep &>/dev/null || pgrep -f "mullvad-(daemon|gui)"; then
elog "Mullvad has been uninstalled. To stop the service,"
elog "1. Quit the Mullvad app"
elog " * Manually: 'Disconnect & quit' from the Mullvad menu"
elog " OR"
elog " * Command line: pkill -f mullvad-gui"
elog "2. Stop the daemon"
elog " * OpenRC: rc-service mullvad-daemon stop"
elog " OR"
elog " * systemd: systemctl stop mullvad-daemon"
elog " OR"
elog " * other: pkill -f mullvad-daemon"
fi
fi
}
pkg_postinst() {
xdg_pkg_postinst
if [[ ${MULLVAD_IS_BEING_UPDATED} = "true" ]]; then
if command -v pgrep &>/dev/null && pgrep -f "mullvad-(daemon|gui)" &>/dev/null; then
elog "Mullvad has been updated. To restart the service,"
elog "1. Restart the daemon"
elog " * OpenRC: rc-service mullvad-daemon restart"
elog " OR"
elog " * systemd: systemctl restart mullvad-daemon"
elog "2. Restart the app"
elog " * Manually: 'Disconnect & quit' from the Mullvad menu and relaunch using"
elog " your preferred desktop launcher"
elog " OR"
elog " * Command line: pkill -f mullvad-gui && '/opt/Mullvad VPN/mullvad-vpn' & disown"
else
elog "Mullvad has been updated. To start the service,"
elog "1. Start the daemon"
elog " * OpenRC: rc-service mullvad-daemon start"
elog " OR"
elog " * systemd: systemctl start mullvad-daemon"
elog "2. Launch the app"
elog " * Manually: use your preferred desktop launcher"
elog " OR"
elog " * Command line: '/opt/Mullvad VPN/mullvad-vpn' & disown"
fi
else
elog "Mullvad has been installed. To start the service,"
elog "1. Enable and start the daemon"
elog " * OpenRC: rc-update add mullvad-daemon default"
elog " rc-service mullvad-daemon start"
elog " OR"
elog " * systemd: systemctl enable mullvad-daemon"
elog " systemctl start mullvad-daemon"
elog "2. Launch the app"
elog " * Manually: use your preferred desktop launcher"
elog " OR"
elog " * Command line: '/opt/Mullvad VPN/mullvad-vpn' & disown"
fi
}