[X2Go-Commits] [live-build-x2go] 36/59: force hardlink creation even if destination file already exists

[git-admin at x2go.org]

This is an automated email from the git hooks/post-receive script.

x2go pushed a commit to branch feature/openbox-magic-pixel-workaround-buster
in repository live-build-x2go.

commit b01db4e2285e9b48a5307c7e4f3bd07991b1bf14
Author: Stefan Baur (BAUR-ITCS) <kontakt at baur-itcs.de>
Date:   Thu Jun 25 03:58:12 2020 +0200

    force hardlink creation even if destination file already exists
---
 config/includes.chroot/etc/network/if-up.d/0410-getbranding | 2 +-
 config/includes.chroot/etc/network/if-up.d/0420-getbg       | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/config/includes.chroot/etc/network/if-up.d/0410-getbranding b/config/includes.chroot/etc/network/if-up.d/0410-getbranding
index ad72d94..868b2b4 100755
--- a/config/includes.chroot/etc/network/if-up.d/0410-getbranding
+++ b/config/includes.chroot/etc/network/if-up.d/0410-getbranding
@@ -41,7 +41,7 @@ if [ -n "$BRANDINGURL" ] ; then
 		echo -en "\n$(date +'%F | %T | ')'$0': branding SVG download complete." | tee -a /dev/tty8
 		if [ -s ${BRANDINGDESTINATION}.tmp ] ; then
 			mv ${BRANDINGDESTINATION}.tmp $BRANDINGDESTINATION
-			ln $BRANDINGDESTINATION /etc/x2go/x2gothinclient_branding.svg
+			ln -f $BRANDINGDESTINATION /etc/x2go/x2gothinclient_branding.svg
 			if [ -s /etc/x2go/x2gothinclient-minidesktop_start ] ; then
 				if ! grep -q -- "--branding" /etc/x2go/x2gothinclient-minidesktop_start ; then
 					sed -e '\#^/usr/lib/x2go/x2goclient#a \\t\t\t --branding="/etc/x2go/x2gothinclient_branding.svg" \\' -i /etc/x2go/x2gothinclient-minidesktop_start
diff --git a/config/includes.chroot/etc/network/if-up.d/0420-getbg b/config/includes.chroot/etc/network/if-up.d/0420-getbg
index a06a017..cf41bbc 100755
--- a/config/includes.chroot/etc/network/if-up.d/0420-getbg
+++ b/config/includes.chroot/etc/network/if-up.d/0420-getbg
@@ -41,7 +41,7 @@ if [ -n "$BGURL" ] ; then
 		echo -en "\n$(date +'%F | %T | ')'$0': background SVG download complete." | tee -a /dev/tty8
 		if [ -s ${BGDESTINATION}.tmp ] ; then
 			mv ${BGDESTINATION}.tmp $BGDESTINATION
-			ln $BGDESTINATION /etc/x2go/x2gothinclient_bg.svg
+			ln -f $BGDESTINATION /etc/x2go/x2gothinclient_bg.svg
 			if [ -s /etc/x2go/x2gothinclient-minidesktop_start ] ; then
 				if ! grep -q -- "--background" /etc/x2go/x2gothinclient-minidesktop_start ; then
 					sed -e '\#^/usr/lib/x2go/x2goclient#a \\t\t\t --background="/etc/x2go/x2gothinclient_bg.svg" \\' -i /etc/x2go/x2gothinclient-minidesktop_start

--
Alioth's /home/x2go-admin/maintenancescripts/git/hooks/post-receive-email on /srv/git/code.x2go.org/live-build-x2go.git