Skip to content

Commit cce4d1b

Browse files
committed
Simplify relative symlink conversion
The string manipulation can be done in pure sh, there is no need for grep and sed.
1 parent 0250eb2 commit cce4d1b

File tree

1 file changed

+3
-3
lines changed

1 file changed

+3
-3
lines changed

webapp/Makefile

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -44,11 +44,11 @@ install-domserver:
4444
# Now change all relative symlinks in webapp/public to their correct paths
4545
for link in $$(find $(DESTDIR)$(domserver_webappdir)/public/$$dir -maxdepth 2 -type l); do \
4646
target=$$(readlink $$link) ; \
47-
if echo $${target} | grep -q '\.\./vendor' ; then \
47+
case $${target} in *../vendor*) \
4848
rm $$link ; \
49-
realtarget=$(domserver_webappdir)/vendor$$(echo $${target} | sed 's!^.*\.\./vendor!!') ; \
49+
realtarget=$(domserver_webappdir)/vendor$${target#*../vendor} ; \
5050
ln -s $$realtarget $$link ; \
51-
fi \
51+
esac \
5252
done
5353
$(INSTALL_DATA) -t $(DESTDIR)$(domserver_webappdir) phpunit.xml.dist .env
5454

0 commit comments

Comments
 (0)