From b997461940ea497cbceff55048f590adf1754afb Mon Sep 17 00:00:00 2001 From: Jaap Eldering Date: Sat, 23 Nov 2024 10:05:57 +0100 Subject: [PATCH 1/2] Clean up rename of symlinks to vendor dir This is a left-over from when that was living under a separate directory `lib/vendor`, but is not relevant anymore since ab267ec1bd8104d63c8a58e64fb9c2018f5a5d99. --- webapp/Makefile | 9 --------- 1 file changed, 9 deletions(-) diff --git a/webapp/Makefile b/webapp/Makefile index 3c1d1340bc..0295991378 100644 --- a/webapp/Makefile +++ b/webapp/Makefile @@ -64,15 +64,6 @@ install-domserver: # Change webapp/public/doc symlink rm $(DESTDIR)$(domserver_webappdir)/public/doc ln -s $(domjudge_docdir) $(DESTDIR)$(domserver_webappdir)/public/doc -# Now change all relative symlinks in webapp/public to their correct paths - for link in $$(find $(DESTDIR)$(domserver_webappdir)/public/$$dir -maxdepth 2 -type l); do \ - target=$$(readlink $$link) ; \ - case $${target} in *../vendor*) \ - rm $$link ; \ - realtarget=$(domserver_webappdir)/vendor$${target#*../vendor} ; \ - ln -s $$realtarget $$link ; \ - esac \ - done $(INSTALL_DATA) -t $(DESTDIR)$(domserver_webappdir) phpunit.xml.dist .env maintainer-conf: .env.local From 2b3e5dcfadbd4bf65969ec129e00e4c0af9dbae6 Mon Sep 17 00:00:00 2001 From: Jaap Eldering Date: Sat, 23 Nov 2024 10:06:56 +0100 Subject: [PATCH 2/2] Simplify (re)creating webapp/public/doc symlink --- webapp/Makefile | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/webapp/Makefile b/webapp/Makefile index 0295991378..f4000332c9 100644 --- a/webapp/Makefile +++ b/webapp/Makefile @@ -62,8 +62,7 @@ install-domserver: $(call install_tree,$(DESTDIR)$(domserver_webappdir),$$d) ; \ done # Change webapp/public/doc symlink - rm $(DESTDIR)$(domserver_webappdir)/public/doc - ln -s $(domjudge_docdir) $(DESTDIR)$(domserver_webappdir)/public/doc + ln -sf $(domjudge_docdir) $(DESTDIR)$(domserver_webappdir)/public/doc $(INSTALL_DATA) -t $(DESTDIR)$(domserver_webappdir) phpunit.xml.dist .env maintainer-conf: .env.local