Follow symlinks when copying Maven home in bootstrap mode
This commit is contained in:
parent
4a08587019
commit
1dad161ef4
@ -234,13 +234,13 @@ version=4.0.0-SNAPSHOT
|
|||||||
maven_home=$(realpath $(dirname $(realpath $(which mvn)))/..)
|
maven_home=$(realpath $(dirname $(realpath $(which mvn)))/..)
|
||||||
|
|
||||||
install -d -m 755 %{buildroot}%{_datadir}/%{name}
|
install -d -m 755 %{buildroot}%{_datadir}/%{name}
|
||||||
cp -r %{name}-${version}*/* %{buildroot}%{_datadir}/%{name}/
|
cp -r%{?mbi:L} %{name}-${version}*/* %{buildroot}%{_datadir}/%{name}/
|
||||||
|
|
||||||
for cmd in mvn mvnDebug; do
|
for cmd in mvn mvnDebug; do
|
||||||
cat <<EOF >%{buildroot}%{_datadir}/%{name}/bin/$cmd
|
cat <<EOF >%{buildroot}%{_datadir}/%{name}/bin/$cmd
|
||||||
#!/bin/sh -e
|
#!/bin/sh -e
|
||||||
export _FEDORA_MAVEN_HOME="%{_datadir}/%{name}"
|
export _FEDORA_MAVEN_HOME="%{_datadir}/%{name}"
|
||||||
exec ${maven_home}/bin/$cmd "\${@}"
|
exec %{_datadir}/maven/bin/$cmd "\${@}"
|
||||||
EOF
|
EOF
|
||||||
chmod 755 %{buildroot}%{_datadir}/%{name}/bin/$cmd
|
chmod 755 %{buildroot}%{_datadir}/%{name}/bin/$cmd
|
||||||
done
|
done
|
||||||
@ -251,10 +251,10 @@ done
|
|||||||
%jpackage_script org.fedoraproject.xmvn.tools.subst.SubstCli "" "" xmvn/xmvn-subst:xmvn/xmvn-api:xmvn/xmvn-core:beust-jcommander xmvn-subst
|
%jpackage_script org.fedoraproject.xmvn.tools.subst.SubstCli "" "" xmvn/xmvn-subst:xmvn/xmvn-api:xmvn/xmvn-core:beust-jcommander xmvn-subst
|
||||||
|
|
||||||
# copy over maven lib directory
|
# copy over maven lib directory
|
||||||
cp -r ${maven_home}/lib/* %{buildroot}%{_datadir}/%{name}/lib/
|
cp -r%{?mbi:L} ${maven_home}/lib/* %{buildroot}%{_datadir}/%{name}/lib/
|
||||||
|
|
||||||
# possibly recreate symlinks that can be automated with xmvn-subst
|
# possibly recreate symlinks that can be automated with xmvn-subst
|
||||||
%if !0%{?sclraw_phase}
|
%if !0%{?mbi}
|
||||||
%{name}-subst -s -R %{buildroot} %{buildroot}%{_datadir}/%{name}/
|
%{name}-subst -s -R %{buildroot} %{buildroot}%{_datadir}/%{name}/
|
||||||
%endif
|
%endif
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user