| 1 |
commit: e31f7a975a787a5236c38a3c5b8462e6a2d2b922 |
| 2 |
Author: Mikle Kolyada <zlogene <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Sun Jan 19 22:08:37 2020 +0000 |
| 4 |
Commit: Mikle Kolyada <zlogene <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Mon Jan 20 09:34:01 2020 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e31f7a97 |
| 7 |
|
| 8 |
texlive-module: kill POSIXism |
| 9 |
|
| 10 |
Signed-off-by: Mikle Kolyada <zlogene <AT> gentoo.org> |
| 11 |
|
| 12 |
eclass/latex-package.eclass | 6 +-- |
| 13 |
eclass/texlive-module.eclass | 88 ++++++++++++++++++++++---------------------- |
| 14 |
2 files changed, 47 insertions(+), 47 deletions(-) |
| 15 |
|
| 16 |
diff --git a/eclass/latex-package.eclass b/eclass/latex-package.eclass |
| 17 |
index 17b937683ac..53d5efe0abc 100644 |
| 18 |
--- a/eclass/latex-package.eclass |
| 19 |
+++ b/eclass/latex-package.eclass |
| 20 |
@@ -127,10 +127,10 @@ latex-package_src_doinstall() { |
| 21 |
if ! in_iuse doc || use doc ; then |
| 22 |
for i in `find . -maxdepth 1 -type f -name "*.${1}"` |
| 23 |
do |
| 24 |
- [[-n ${LATEX_PACKAGE_SKIP} ]] && has ${i##*/} ${LATEX_PACKAGE_SKIP} && continue |
| 25 |
+ [[ -n ${LATEX_PACKAGE_SKIP} ]] && has ${i##*/} ${LATEX_PACKAGE_SKIP} && continue |
| 26 |
einfo "Making documentation: ${i}" |
| 27 |
- if pdflatex ${LATEX_DOC_ARGUMENTS} --halt-on-error --interaction=nonstopmode $i ; then |
| 28 |
- pdflatex ${LATEX_DOC_ARGUMENTS} --halt-on-error --interaction=nonstopmode $i || die |
| 29 |
+ if pdflatex ${LATEX_DOC_ARGUMENTS} --halt-on-error --interaction=nonstopmode ${i} ; then |
| 30 |
+ pdflatex ${LATEX_DOC_ARGUMENTS} --halt-on-error --interaction=nonstopmode ${i} || die |
| 31 |
else |
| 32 |
einfo "pdflatex failed, trying texi2dvi" |
| 33 |
texi2dvi -q -c --language=latex ${i} || die |
| 34 |
|
| 35 |
diff --git a/eclass/texlive-module.eclass b/eclass/texlive-module.eclass |
| 36 |
index 52b26cdca4d..0239e90eb92 100644 |
| 37 |
--- a/eclass/texlive-module.eclass |
| 38 |
+++ b/eclass/texlive-module.eclass |
| 39 |
@@ -97,14 +97,14 @@ for i in ${TEXLIVE_MODULE_CONTENTS}; do |
| 40 |
done |
| 41 |
|
| 42 |
# Forge doc SRC_URI |
| 43 |
-[ -n "${TEXLIVE_MODULE_DOC_CONTENTS}" ] && SRC_URI="${SRC_URI} doc? (" |
| 44 |
+[[ -n ${TEXLIVE_MODULE_DOC_CONTENTS} ]] && SRC_URI="${SRC_URI} doc? (" |
| 45 |
for i in ${TEXLIVE_MODULE_DOC_CONTENTS}; do |
| 46 |
SRC_URI="${SRC_URI} mirror://gentoo/texlive-module-${i}-${PV}.${PKGEXT}" |
| 47 |
done |
| 48 |
-[ -n "${TEXLIVE_MODULE_DOC_CONTENTS}" ] && SRC_URI="${SRC_URI} )" |
| 49 |
+[[ -n ${TEXLIVE_MODULE_DOC_CONTENTS} ]] && SRC_URI="${SRC_URI} )" |
| 50 |
|
| 51 |
# Forge source SRC_URI |
| 52 |
-if [ -n "${TEXLIVE_MODULE_SRC_CONTENTS}" ] ; then |
| 53 |
+if [[ -n ${TEXLIVE_MODULE_SRC_CONTENTS} ]] ; then |
| 54 |
SRC_URI="${SRC_URI} source? (" |
| 55 |
for i in ${TEXLIVE_MODULE_SRC_CONTENTS}; do |
| 56 |
SRC_URI="${SRC_URI} mirror://gentoo/texlive-module-${i}-${PV}.${PKGEXT}" |
| 57 |
@@ -122,7 +122,7 @@ IUSE="${IUSE} doc" |
| 58 |
# A space separated list of Tex engines that can be made optional. |
| 59 |
# e.g. "luatex luajittex" |
| 60 |
|
| 61 |
-if [ -n "${TEXLIVE_MODULE_OPTIONAL_ENGINE}" ] ; then |
| 62 |
+if [[ -n ${TEXLIVE_MODULE_OPTIONAL_ENGINE} ]] ; then |
| 63 |
for engine in ${TEXLIVE_MODULE_OPTIONAL_ENGINE} ; do |
| 64 |
IUSE="${IUSE} +${engine}" |
| 65 |
done |
| 66 |
@@ -143,7 +143,7 @@ texlive-module_src_unpack() { |
| 67 |
grep RELOC tlpkg/tlpobj/* | awk '{print $2}' | sed 's#^RELOC/##' > "${T}/reloclist" |
| 68 |
{ for i in $(<"${T}/reloclist"); do dirname $i; done; } | uniq > "${T}/dirlist" |
| 69 |
for i in $(<"${T}/dirlist"); do |
| 70 |
- [ -d "${RELOC_TARGET}/${i}" ] || mkdir -p "${RELOC_TARGET}/${i}" |
| 71 |
+ [[ -d ${RELOC_TARGET}/${i} ]] || mkdir -p "${RELOC_TARGET}/${i}" |
| 72 |
done |
| 73 |
for i in $(<"${T}/reloclist"); do |
| 74 |
mv "${i}" "${RELOC_TARGET}"/$(dirname "${i}") || die "failed to relocate ${i} to ${RELOC_TARGET}/$(dirname ${i})" |
| 75 |
@@ -161,13 +161,13 @@ texlive-module_add_format() { |
| 76 |
local name engine mode patterns options |
| 77 |
eval $@ |
| 78 |
einfo "Appending to format.${PN}.cnf for $@" |
| 79 |
- [ -d texmf-dist/fmtutil ] || mkdir -p texmf-dist/fmtutil |
| 80 |
- [ -f texmf-dist/fmtutil/format.${PN}.cnf ] || { echo "# Generated for ${PN} by texlive-module.eclass" > texmf-dist/fmtutil/format.${PN}.cnf; } |
| 81 |
- [ -n "${TEXLIVE_MODULE_OPTIONAL_ENGINE}" ] && has ${engine} ${TEXLIVE_MODULE_OPTIONAL_ENGINE} && use !${engine} && mode="disabled" |
| 82 |
- if [ "${mode}" = "disabled" ]; then |
| 83 |
+ [[ -d texmf-dist/fmtutil ]] || mkdir -p texmf-dist/fmtutil |
| 84 |
+ [[ -f texmf-dist/fmtutil/format.${PN}.cnf ]] || { echo "# Generated for ${PN} by texlive-module.eclass" > texmf-dist/fmtutil/format.${PN}.cnf; } |
| 85 |
+ [[ -n "${TEXLIVE_MODULE_OPTIONAL_ENGINE}" ]] && has ${engine} ${TEXLIVE_MODULE_OPTIONAL_ENGINE} && use !${engine} && mode="disabled" |
| 86 |
+ if [[ ${mode} = disabled ]]; then |
| 87 |
printf "#! " >> texmf-dist/fmtutil/format.${PN}.cnf |
| 88 |
fi |
| 89 |
- [ -z "${patterns}" ] && patterns="-" |
| 90 |
+ [[ -z ${patterns} ]] && patterns="-" |
| 91 |
printf "${name}\t${engine}\t${patterns}\t${options}\n" >> texmf-dist/fmtutil/format.${PN}.cnf |
| 92 |
} |
| 93 |
|
| 94 |
@@ -180,10 +180,10 @@ texlive-module_make_language_def_lines() { |
| 95 |
local lefthyphenmin righthyphenmin synonyms name file file_patterns file_exceptions luaspecial |
| 96 |
eval $@ |
| 97 |
einfo "Generating language.def entry for $@" |
| 98 |
- [ -z "$lefthyphenmin" ] && lefthyphenmin="2" |
| 99 |
- [ -z "$righthyphenmin" ] && righthyphenmin="3" |
| 100 |
+ [[ -z ${lefthyphenmin} ]] && lefthyphenmin="2" |
| 101 |
+ [[ -z ${righthyphenmin} ]] && righthyphenmin="3" |
| 102 |
echo "\\addlanguage{$name}{$file}{}{$lefthyphenmin}{$righthyphenmin}" >> "${S}/language.${PN}.def" |
| 103 |
- if [ -n "$synonyms" ] ; then |
| 104 |
+ if [[ -n ${synonyms} ]] ; then |
| 105 |
for i in $(echo $synonyms | tr ',' ' ') ; do |
| 106 |
einfo "Generating language.def synonym $i for $@" |
| 107 |
echo "\\addlanguage{$i}{$file}{}{$lefthyphenmin}{$righthyphenmin}" >> "${S}/language.${PN}.def" |
| 108 |
@@ -201,10 +201,10 @@ texlive-module_make_language_dat_lines() { |
| 109 |
eval $@ |
| 110 |
einfo "Generating language.dat entry for $@" |
| 111 |
echo "$name $file" >> "${S}/language.${PN}.dat" |
| 112 |
- if [ -n "$synonyms" ] ; then |
| 113 |
- for i in $(echo $synonyms | tr ',' ' ') ; do |
| 114 |
- einfo "Generating language.dat synonym $i for $@" |
| 115 |
- echo "=$i" >> "${S}/language.${PN}.dat" |
| 116 |
+ if [[ -n ${synonyms} ]] ; then |
| 117 |
+ for i in $(echo ${synonyms} | tr ',' ' ') ; do |
| 118 |
+ einfo "Generating language.dat synonym ${i} for $@" |
| 119 |
+ echo "=${i}" >> "${S}/language.${PN}.dat" |
| 120 |
done |
| 121 |
fi |
| 122 |
} |
| 123 |
@@ -217,7 +217,7 @@ texlive-module_make_language_dat_lines() { |
| 124 |
texlive-module_synonyms_to_language_lua_line() { |
| 125 |
local prev="" |
| 126 |
for i in $(echo $@ | tr ',' ' ') ; do |
| 127 |
- printf "${prev} '%s'" $i |
| 128 |
+ printf "${prev} '%s'" ${i} |
| 129 |
prev="," |
| 130 |
done |
| 131 |
} |
| 132 |
@@ -233,16 +233,16 @@ texlive-module_make_language_lua_lines() { |
| 133 |
local lefthyphenmin righthyphenmin synonyms name file file_patterns file_exceptions luaspecial |
| 134 |
local dest="${S}/language.${PN}.dat.lua" |
| 135 |
eval $@ |
| 136 |
- [ -z "$lefthyphenmin" ] && lefthyphenmin="2" |
| 137 |
- [ -z "$righthyphenmin" ] && righthyphenmin="3" |
| 138 |
+ [[ -z ${lefthyphenmin} ]] && lefthyphenmin="2" |
| 139 |
+ [[ -z $righthyphenmin ]] && righthyphenmin="3" |
| 140 |
einfo "Generating language.dat.lua entry for $@" |
| 141 |
printf "\t['%s'] = {\n" "$name" >> "$dest" |
| 142 |
printf "\t\tloader = '%s',\n" "$file" >> "$dest" |
| 143 |
printf "\t\tlefthyphenmin = %s,\n\t\trighthyphenmin = %s,\n" "$lefthyphenmin" "$righthyphenmin" >> "$dest" |
| 144 |
printf "\t\tsynonyms = {%s },\n" "$(texlive-module_synonyms_to_language_lua_line "$synonyms")" >> "$dest" |
| 145 |
- [ -n "$file_patterns" ] && printf "\t\tpatterns = '%s',\n" "$file_patterns" >> "$dest" |
| 146 |
- [ -n "$file_exceptions" ] && printf "\t\thyphenation = '%s',\n" "$file_exceptions" >> "$dest" |
| 147 |
- [ -n "$luaspecial" ] && printf "\t\tspecial = '%s',\n" "$luaspecial" >> "$dest" |
| 148 |
+ [[ -n ${file_patterns} ]] && printf "\t\tpatterns = '%s',\n" "$file_patterns" >> "$dest" |
| 149 |
+ [[ -n ${file_exceptions} ]] && printf "\t\thyphenation = '%s',\n" "$file_exceptions" >> "$dest" |
| 150 |
+ [[ -n ${luaspecial} ]] && printf "\t\tspecial = '%s',\n" "$luaspecial" >> "$dest" |
| 151 |
printf "\t},\n" >> "$dest" |
| 152 |
} |
| 153 |
|
| 154 |
@@ -304,10 +304,10 @@ texlive-module_src_compile() { |
| 155 |
|
| 156 |
# Build format files |
| 157 |
for i in texmf-dist/fmtutil/format*.cnf; do |
| 158 |
- if [ -f "${i}" ]; then |
| 159 |
+ if [[ -f ${i} ]]; then |
| 160 |
einfo "Building format ${i}" |
| 161 |
- [ -d texmf-var ] || mkdir texmf-var |
| 162 |
- [ -d texmf-var/web2c ] || mkdir texmf-var/web2c |
| 163 |
+ [[ -d texmf-var ]] || mkdir texmf-var |
| 164 |
+ [[ -d texmf-var/web2c ]] || mkdir texmf-var/web2c |
| 165 |
VARTEXFONTS="${T}/fonts" TEXMFHOME="${S}/texmf:${S}/texmf-dist:${S}/texmf-var"\ |
| 166 |
env -u TEXINPUTS $fmt_call --cnffile "${i}" --fmtdir "${S}/texmf-var/web2c" --all\ |
| 167 |
|| die "failed to build format ${i}" |
| 168 |
@@ -326,50 +326,50 @@ texlive-module_src_compile() { |
| 169 |
|
| 170 |
texlive-module_src_install() { |
| 171 |
for i in texmf-dist/fmtutil/format*.cnf; do |
| 172 |
- [ -f "${i}" ] && etexlinks "${i}" |
| 173 |
+ [[ -f ${i} ]] && etexlinks "${i}" |
| 174 |
done |
| 175 |
|
| 176 |
dodir /usr/share |
| 177 |
if use doc; then |
| 178 |
- [ -d texmf-doc ] && cp -pR texmf-doc "${ED}/usr/share/" |
| 179 |
+ [[ -d texmf-doc ]] && cp -pR texmf-doc "${ED}/usr/share/" |
| 180 |
else |
| 181 |
- [ -d texmf/doc ] && rm -rf texmf/doc |
| 182 |
- [ -d texmf-dist/doc ] && rm -rf texmf-dist/doc |
| 183 |
+ [[ -d texmf/doc ]] && rm -rf texmf/doc |
| 184 |
+ [[ -d texmf-dist/doc ]] && rm -rf texmf-dist/doc |
| 185 |
fi |
| 186 |
|
| 187 |
- [ -d texmf ] && cp -pR texmf "${ED}/usr/share/" |
| 188 |
- [ -d texmf-dist ] && cp -pR texmf-dist "${ED}/usr/share/" |
| 189 |
- [ -d tlpkg ] && use source && cp -pR tlpkg "${ED}/usr/share/" |
| 190 |
+ [[ -d texmf ]] && cp -pR texmf "${ED}/usr/share/" |
| 191 |
+ [[ -d texmf-dist ]] && cp -pR texmf-dist "${ED}/usr/share/" |
| 192 |
+ [[ -d tlpkg ]] && use source && cp -pR tlpkg "${ED}/usr/share/" |
| 193 |
|
| 194 |
insinto /var/lib/texmf |
| 195 |
- [ -d texmf-var ] && doins -r texmf-var/* |
| 196 |
+ [[ -d texmf-var ]] && doins -r texmf-var/* |
| 197 |
|
| 198 |
insinto /etc/texmf/updmap.d |
| 199 |
- [ -f "${S}/${PN}.cfg" ] && doins "${S}/${PN}.cfg" |
| 200 |
+ [[ -f ${S}/${PN}.cfg ]] && doins "${S}/${PN}.cfg" |
| 201 |
insinto /etc/texmf/dvips.d |
| 202 |
- [ -f "${S}/${PN}-config.ps" ] && doins "${S}/${PN}-config.ps" |
| 203 |
+ [[ -f ${S}/${PN}-config.ps ]] && doins "${S}/${PN}-config.ps" |
| 204 |
insinto /etc/texmf/dvipdfm/config |
| 205 |
- [ -f "${S}/${PN}-config" ] && doins "${S}/${PN}-config" |
| 206 |
+ [[ -f ${S}/${PN}-config ]] && doins "${S}/${PN}-config" |
| 207 |
|
| 208 |
- if [ -f "${S}/language.${PN}.def" ] ; then |
| 209 |
+ if [[ -f ${S}/language.${PN}.def ]] ; then |
| 210 |
insinto /etc/texmf/language.def.d |
| 211 |
doins "${S}/language.${PN}.def" |
| 212 |
fi |
| 213 |
|
| 214 |
- if [ -f "${S}/language.${PN}.dat" ] ; then |
| 215 |
+ if [[ -f ${S}/language.${PN}.dat ]] ; then |
| 216 |
insinto /etc/texmf/language.dat.d |
| 217 |
doins "${S}/language.${PN}.dat" |
| 218 |
fi |
| 219 |
|
| 220 |
- if [ -f "${S}/language.${PN}.dat.lua" ] ; then |
| 221 |
+ if [[ -f ${S}/language.${PN}.dat.lua ]] ; then |
| 222 |
insinto /etc/texmf/language.dat.lua.d |
| 223 |
doins "${S}/language.${PN}.dat.lua" |
| 224 |
fi |
| 225 |
|
| 226 |
- [ -n "${TEXLIVE_MODULE_BINSCRIPTS}" ] && dobin_texmf_scripts ${TEXLIVE_MODULE_BINSCRIPTS} |
| 227 |
- if [ -n "${TEXLIVE_MODULE_BINLINKS}" ] ; then |
| 228 |
+ [[ -n ${TEXLIVE_MODULE_BINSCRIPTS} ]] && dobin_texmf_scripts ${TEXLIVE_MODULE_BINSCRIPTS} |
| 229 |
+ if [[ -n ${TEXLIVE_MODULE_BINLINKS} ] ; then |
| 230 |
for i in ${TEXLIVE_MODULE_BINLINKS} ; do |
| 231 |
- [ -f "${ED}/usr/bin/${i%:*}" ] || die "Trying to install an invalid BINLINK. This should not happen. Please file a bug." |
| 232 |
+ [[ -f "${ED}/usr/bin/${i%:*} ]] || die "Trying to install an invalid BINLINK. This should not happen. Please file a bug." |
| 233 |
dosym ${i%:*} /usr/bin/${i#*:} |
| 234 |
done |
| 235 |
fi |
| 236 |
@@ -386,7 +386,7 @@ texlive-module_src_install() { |
| 237 |
|
| 238 |
texlive-module_pkg_postinst() { |
| 239 |
etexmf-update |
| 240 |
- [ -n "${TL_MODULE_INFORMATION}" ] && elog "${TL_MODULE_INFORMATION}" |
| 241 |
+ [[ -n ${TL_MODULE_INFORMATION} ]] && elog "${TL_MODULE_INFORMATION}" |
| 242 |
} |
| 243 |
|
| 244 |
# @FUNCTION: texlive-module_pkg_postrm |
Archives