[arch-commits] Commit in java7-openjdk/trunk (PKGBUILD)
Guillaume Alaux
guillaume at nymeria.archlinux.org
Sun May 11 19:10:09 UTC 2014
Date: Sunday, May 11, 2014 @ 21:10:09
Author: guillaume
Revision: 212286
Add double-quotes around pkgdir and srcdir
Modified:
java7-openjdk/trunk/PKGBUILD
----------+
PKGBUILD | 98 ++++++++++++++++++++++++++++++-------------------------------
1 file changed, 49 insertions(+), 49 deletions(-)
Modified: PKGBUILD
===================================================================
--- PKGBUILD 2014-05-11 18:54:44 UTC (rev 212285)
+++ PKGBUILD 2014-05-11 19:10:09 UTC (rev 212286)
@@ -91,7 +91,7 @@
. /etc/profile.d/apache-ant.sh
- cp ${srcdir}/*.diff ${srcdir}/icedtea-${_icedtea_ver}/patches
+ cp "${srcdir}"/*.diff "${srcdir}"/icedtea-${_icedtea_ver}/patches
export DISTRIBUTION_PATCHES="patches/fontconfig-paths.diff \
patches/openjdk7_nonreparenting-wm.diff"
@@ -108,13 +108,13 @@
--disable-downloading --disable-Werror \
--with-pkgversion="ArchLinux build ${pkgver}-${pkgrel}-${CARCH}" \
--with-jdk-home=${JAVA_HOME} \
- --with-openjdk-src-zip=${srcdir}/openjdk-${_OPENJDK_CHANGESET}.tar.gz \
- --with-hotspot-src-zip=${srcdir}/hotspot-${_HOTSPOT_CHANGESET}.tar.gz \
- --with-corba-src-zip=${srcdir}/corba-${_CORBA_CHANGESET}.tar.gz \
- --with-jaxp-src-zip=${srcdir}/jaxp-${_JAXP_CHANGESET}.tar.gz \
- --with-jaxws-src-zip=${srcdir}/jaxws-${_JAXWS_CHANGESET}.tar.gz \
- --with-jdk-src-zip=${srcdir}/jdk-${_JDK_CHANGESET}.tar.gz \
- --with-langtools-src-zip=${srcdir}/langtools-${_LANGTOOLS_CHANGESET}.tar.gz \
+ --with-openjdk-src-zip="${srcdir}/openjdk-${_OPENJDK_CHANGESET}.tar.gz" \
+ --with-hotspot-src-zip="${srcdir}/hotspot-${_HOTSPOT_CHANGESET}.tar.gz" \
+ --with-corba-src-zip="${srcdir}/corba-${_CORBA_CHANGESET}.tar.gz" \
+ --with-jaxp-src-zip="${srcdir}/jaxp-${_JAXP_CHANGESET}.tar.gz" \
+ --with-jaxws-src-zip="${srcdir}/jaxws-${_JAXWS_CHANGESET}.tar.gz" \
+ --with-jdk-src-zip="${srcdir}/jdk-${_JDK_CHANGESET}.tar.gz" \
+ --with-langtools-src-zip="${srcdir}/langtools-${_LANGTOOLS_CHANGESET}.tar.gz" \
--enable-pulse-java \
--enable-nss \
--with-rhino \
@@ -163,8 +163,8 @@
cd "${srcdir}/${_imgdir}/jre"
- install -d -m755 ${pkgdir}${_jvmdir}/jre
- cp -a bin lib ${pkgdir}${_jvmdir}/jre
+ install -d -m755 "${pkgdir}${_jvmdir}/jre"
+ cp -a bin lib "${pkgdir}${_jvmdir}/jre"
# Set config files
mv "${pkgdir}${_jvmdir}"/jre/lib/fontconfig.{Ubuntu.properties.src,properties}
@@ -192,26 +192,26 @@
popd
# Link binaries into /usr/bin
- pushd ${pkgdir}${_jvmdir}/jre/bin
- install -m755 -d ${pkgdir}/usr/bin/
+ pushd "${pkgdir}${_jvmdir}/jre/bin"
+ install -d -m755 "${pkgdir}/usr/bin/"
for file in *; do
- ln -sf ${_jvmdir}/jre/bin/${file} ${pkgdir}/usr/bin
+ ln -sf ${_jvmdir}/jre/bin/${file} "${pkgdir}/usr/bin"
done
popd
# Link JKS keystore from ca-certificates-java
- rm -f ${pkgdir}${_jvmdir}/jre/lib/security/cacerts
+ rm -f "${pkgdir}${_jvmdir}/jre/lib/security/cacerts"
ln -sf /etc/ssl/certs/java/cacerts "${pkgdir}${_jvmdir}/jre/lib/security/cacerts"
# Set some variables
- install -m755 -d ${pkgdir}/etc/profile.d/
- install -m755 ${srcdir}/jre7-openjdk.profile ${pkgdir}/etc/profile.d/jre.sh
- install -m755 ${srcdir}/jre7-openjdk.profile.csh ${pkgdir}/etc/profile.d/jre.csh
+ install -d -m755 "${pkgdir}/etc/profile.d/"
+ install -m755 "${srcdir}/jre7-openjdk.profile" "${pkgdir}/etc/profile.d/jre.sh"
+ install -m755 "${srcdir}/jre7-openjdk.profile.csh" "${pkgdir}/etc/profile.d/jre.csh"
# Install license
- install -m755 -d ${pkgdir}/usr/share/licenses/${pkgbase}/
+ install -d -m755 "${pkgdir}/usr/share/licenses/${pkgbase}/"
install -m644 ASSEMBLY_EXCEPTION LICENSE THIRD_PARTY_README \
- ${pkgdir}/usr/share/licenses/${pkgbase}
+ "${pkgdir}/usr/share/licenses/${pkgbase}"
ln -sf /usr/share/licenses/${pkgbase} "${pkgdir}/usr/share/licenses/${pkgname}"
# Move config files that were set in _backup_etc from ./lib to /etc
@@ -242,10 +242,10 @@
done
# Link binaries into /usr/bin
- pushd ${pkgdir}${_jvmdir}/jre/bin
- install -m755 -d ${pkgdir}/usr/bin/
+ pushd "${pkgdir}${_jvmdir}/jre/bin"
+ install -d -m755 "${pkgdir}/usr/bin/"
for file in *; do
- ln -sf ${_jvmdir}/jre/bin/${file} ${pkgdir}/usr/bin
+ ln -sf ${_jvmdir}/jre/bin/${file} "${pkgdir}/usr/bin"
done
popd
@@ -262,17 +262,17 @@
# Install icons and menu entries
for s in 16 24 32 48 ; do
- install -m755 -d ${pkgdir}/usr/share/icons/hicolor/${s}x${s}/apps/
+ install -d -m755 "${pkgdir}/usr/share/icons/hicolor/${s}x${s}/apps/"
install -m644 ../../../openjdk/jdk/src/solaris/classes/sun/awt/X11/java-icon${s}.png \
- ${pkgdir}/usr/share/icons/hicolor/${s}x${s}/apps/java.png
+ "${pkgdir}/usr/share/icons/hicolor/${s}x${s}/apps/java.png"
done
# Install desktop files.
- install -m755 -d ${pkgdir}/usr/share/applications
- install -m644 ${srcdir}/icedtea-${_icedtea_ver}/policytool.desktop ${pkgdir}/usr/share/applications
+ install -d -m755 "${pkgdir}/usr/share/applications"
+ install -m644 "${srcdir}/icedtea-${_icedtea_ver}/policytool.desktop" "${pkgdir}/usr/share/applications"
# link license
- install -m755 -d ${pkgdir}/usr/share/licenses
+ install -d -m755 "${pkgdir}/usr/share/licenses"
ln -sf /usr/share/licenses/${pkgbase} "${pkgdir}/usr/share/licenses/${pkgname}"
}
@@ -287,50 +287,50 @@
cd "${srcdir}/${_imgdir}"
# Main files
- install -m755 -d ${pkgdir}${_jvmdir}
+ install -d -m755 "${pkgdir}${_jvmdir}"
- cp -a include lib ${pkgdir}${_jvmdir}
+ cp -a include lib "${pkgdir}${_jvmdir}"
# 'bin' files
pushd bin
- install -m755 -d ${pkgdir}${_jvmdir}/bin/ \
- ${pkgdir}/usr/bin/ \
- ${pkgdir}/usr/share/man/{,ja/}man1/
+ install -d -m755 "${pkgdir}${_jvmdir}/bin/" \
+ "${pkgdir}"/usr/bin/ \
+ "${pkgdir}"/usr/share/man/{,ja/}man1/
# 'java-rmi.cgi' will be handled separately as it should not be in the PATH and has no man page
for b in $(ls | grep -v java-rmi.cgi); do
if [ -e ../jre/bin/${b} ]; then
# Provide a link of the jre binary in the jdk/bin/ directory
- ln -s ../jre/bin/${b} ${pkgdir}${_jvmdir}/bin/${b}
+ ln -s ../jre/bin/${b} "${pkgdir}${_jvmdir}/bin/${b}"
else
# Copy binary to jdk/bin/
- install -m755 ${b} ${pkgdir}${_jvmdir}/bin/${b}
+ install -m755 ${b} "${pkgdir}${_jvmdir}/bin/${b}"
# Copy man page
- install -m644 ../man/man1/${b}.1 ${pkgdir}/usr/share/man/man1/${b}.1
- install -m644 ../man/ja/man1/${b}.1 ${pkgdir}/usr/share/man/ja/man1/${b}.1
+ install -m644 ../man/man1/${b}.1 "${pkgdir}/usr/share/man/man1/${b}.1"
+ install -m644 ../man/ja/man1/${b}.1 "${pkgdir}/usr/share/man/ja/man1/${b}.1"
# Link from /bin/
- ln -s ${_jvmdir}/bin/${b} ${pkgdir}/usr/bin/${b}
+ ln -s ${_jvmdir}/bin/${b} "${pkgdir}/usr/bin/${b}"
fi
done
popd
# Handling 'java-rmi.cgi' separately
- install -m755 -D bin/java-rmi.cgi ${pkgdir}${_jvmdir}/bin/java-rmi.cgi
+ install -D -m755 bin/java-rmi.cgi "${pkgdir}${_jvmdir}/bin/java-rmi.cgi"
# Install desktop files.
- install -m755 -d ${pkgdir}/usr/share/applications
- install -m644 ${srcdir}/icedtea-${_icedtea_ver}/jconsole.desktop ${pkgdir}/usr/share/applications
+ install -d -m755 "${pkgdir}/usr/share/applications"
+ install -m644 "${srcdir}/icedtea-${_icedtea_ver}/jconsole.desktop" "${pkgdir}/usr/share/applications"
# Set some variables
- install -m755 -d ${pkgdir}/etc/profile.d/
- install -m755 ${srcdir}/${pkgname}.profile ${pkgdir}/etc/profile.d/jdk.sh
- install -m755 ${srcdir}/${pkgname}.profile.csh ${pkgdir}/etc/profile.d/jdk.csh
+ install -d -m755 "${pkgdir}/etc/profile.d/"
+ install -m755 "${srcdir}/${pkgname}.profile" "${pkgdir}/etc/profile.d/jdk.sh"
+ install -m755 "${srcdir}/${pkgname}.profile.csh" "${pkgdir}/etc/profile.d/jdk.csh"
# Temporarily fixing FS#35141
- chmod go+r ${pkgdir}${_jvmdir}/lib/sa-jdi.jar
+ chmod go+r "${pkgdir}${_jvmdir}/lib/sa-jdi.jar"
# link license
- install -m755 -d ${pkgdir}/usr/share/licenses
+ install -d -m755 "${pkgdir}/usr/share/licenses"
ln -sf /usr/share/licenses/${pkgbase} "${pkgdir}/usr/share/licenses/${pkgname}"
}
@@ -338,14 +338,14 @@
pkgdesc='OpenJDK Java 7 sources'
replaces=('openjdk6-src')
- install -D ${srcdir}/${_imgdir}/src.zip ${pkgdir}${_jvmdir}/src.zip
+ install -D "${srcdir}/${_imgdir}/src.zip" "${pkgdir}${_jvmdir}/src.zip"
}
package_openjdk7-doc() {
pkgdesc='OpenJDK Java 7 documentation'
- install -m755 -d ${pkgdir}/usr/share/doc/openjdk7-doc
- for i in ${srcdir}/icedtea-${_icedtea_ver}/openjdk.build/docs/*; do
- cp -a $i ${pkgdir}/usr/share/doc/openjdk7-doc/
+ install -d -m755 "${pkgdir}/usr/share/doc/openjdk7-doc"
+ for i in "${srcdir}"/icedtea-${_icedtea_ver}/openjdk.build/docs/*; do
+ cp -a $i "${pkgdir}/usr/share/doc/openjdk7-doc/"
done
}
More information about the arch-commits
mailing list