From 8efc0319ce654056e6eff37c6e46002fb60558b3 Mon Sep 17 00:00:00 2001 From: Thomas Haller Date: Fri, 5 Aug 2022 10:31:44 +0200 Subject: [PATCH] build/meson: force overwriting files in "meson-post-install.sh" Repeated `ninja -C build install` should succeed. But they did not: Running custom install script '/data/src/NetworkManager/tools/meson-post-install.sh /usr/share /usr/bin /etc/NetworkManager /usr/lib/NetworkManager /var/lib/NetworkManager /usr/share/man /etc 1 1 1 1' --- stdout --- --- stderr --- ln: failed to create symbolic link '/usr/lib/NetworkManager/dispatcher.d/90-nm-cloud-setup.sh': File exists --- tools/meson-post-install.sh | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/tools/meson-post-install.sh b/tools/meson-post-install.sh index 88e30ccfc1..45f3e37c6b 100755 --- a/tools/meson-post-install.sh +++ b/tools/meson-post-install.sh @@ -16,7 +16,7 @@ install_systemdunitdir="${11}" if [ -x "${DESTDIR}${nm_bindir}/nmtui" ]; then for alias in nmtui-connect nmtui-edit nmtui-hostname; do - ln -sf nmtui "${DESTDIR}${nm_bindir}/$alias" + ln -sfn nmtui "${DESTDIR}${nm_bindir}/$alias" done fi @@ -43,11 +43,11 @@ chmod 0700 "${DESTDIR}${nm_pkgstatedir}" if [ "$enable_docs" = 1 ]; then for alias in nmtui-connect nmtui-edit nmtui-hostname; do - ln -f "${DESTDIR}${nm_mandir}/man1/nmtui.1" "${DESTDIR}${nm_mandir}/man1/${alias}.1" + ln -fn "${DESTDIR}${nm_mandir}/man1/nmtui.1" "${DESTDIR}${nm_mandir}/man1/${alias}.1" done - ln -f "${DESTDIR}${nm_mandir}/man5/NetworkManager.conf.5" "${DESTDIR}${nm_mandir}/man5/nm-system-settings.conf.5" - ln -f "${DESTDIR}${nm_mandir}/man5/nm-settings-nmcli.5" "${DESTDIR}${nm_mandir}/man5/nm-settings.5" + ln -fn "${DESTDIR}${nm_mandir}/man5/NetworkManager.conf.5" "${DESTDIR}${nm_mandir}/man5/nm-system-settings.conf.5" + ln -fn "${DESTDIR}${nm_mandir}/man5/nm-settings-nmcli.5" "${DESTDIR}${nm_mandir}/man5/nm-settings.5" fi if [ "$enable_ifcfg_rh" = 1 ]; then @@ -55,6 +55,6 @@ if [ "$enable_ifcfg_rh" = 1 ]; then fi if [ "$enable_nm_cloud_setup" = 1 -a "$install_systemdunitdir" = 1 ]; then - ln -s 'no-wait.d/90-nm-cloud-setup.sh' "${DESTDIR}${nm_pkglibdir}/dispatcher.d/90-nm-cloud-setup.sh" + ln -sfn 'no-wait.d/90-nm-cloud-setup.sh' "${DESTDIR}${nm_pkglibdir}/dispatcher.d/90-nm-cloud-setup.sh" fi