rpms/java-openjdk
3
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Changed possibly confusing # in sed expressions by @

Browse Source
This commit is contained in:
Jiri Vanek 2018-06-04 10:50:47 +02:00
parent fcdb38d346
commit 9ca0360db1
2 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
java-openjdk.spec
View File

@ -1246,10 +1246,10 @@ for file in %{SOURCE9}; do
EXT="${FILE##*.}"
NAME="${FILE%.*}"
OUTPUT_FILE=$NAME$suffix.$EXT
sed -e "s:#JAVA_HOME#:%{sdkbindir -- $suffix}:g" $file > $OUTPUT_FILE
sed -i -e "s:#JRE_HOME#:%{jrebindir -- $suffix}:g" $OUTPUT_FILE
sed -i -e "s:#ARCH#:%{version}-%{release}.%{_arch}$suffix:g" $OUTPUT_FILE
sed -i -e "s:#JAVA_MAJOR_VERSION#:%{majorver}:g" $OUTPUT_FILE
sed -e "s:@JAVA_HOME@:%{sdkbindir -- $suffix}:g" $file > $OUTPUT_FILE
sed -i -e "s:@JRE_HOME@:%{jrebindir -- $suffix}:g" $OUTPUT_FILE
sed -i -e "s:@ARCH@:%{version}-%{release}.%{_arch}$suffix:g" $OUTPUT_FILE
sed -i -e "s:@JAVA_MAJOR_VERSION@:%{majorver}:g" $OUTPUT_FILE
done
done

8
jconsole.desktop.in
View File

@ -1,8 +1,8 @@
[Desktop Entry]
Name=OpenJDK #JAVA_MAJOR_VERSION# Monitoring & Management Console #ARCH#
Comment=Monitor and manage OpenJDK applications for #ARCH#
Exec=#JAVA_HOME#/jconsole
Icon=java-#JAVA_MAJOR_VERSION#
Name=OpenJDK @JAVA_MAJOR_VERSION@ Monitoring & Management Console @ARCH@
Comment=Monitor and manage OpenJDK applications for @ARCH@
Exec=@JAVA_HOME@/jconsole
Icon=java-@JAVA_MAJOR_VERSION@
Terminal=false
Type=Application
StartupWMClass=sun-tools-jconsole-JConsole