/[gentoo-x86]/eclass/elisp-common.eclass
Gentoo

Diff of /eclass/elisp-common.eclass

Parent Directory Parent Directory | Revision Log Revision Log | View Patch Patch

Revision 1.52 Revision 1.59
1# Copyright 1999-2008 Gentoo Foundation 1# Copyright 1999-2009 Gentoo Foundation
2# Distributed under the terms of the GNU General Public License v2 2# Distributed under the terms of the GNU General Public License v2
3# $Header: /var/cvsroot/gentoo-x86/eclass/elisp-common.eclass,v 1.52 2008/11/24 14:21:04 ulm Exp $ 3# $Header: /var/cvsroot/gentoo-x86/eclass/elisp-common.eclass,v 1.59 2009/04/08 10:47:42 ulm Exp $
4# 4#
5# Copyright 2002-2004 Matthew Kennedy <mkennedy@gentoo.org> 5# Copyright 2002-2004 Matthew Kennedy <mkennedy@gentoo.org>
6# Copyright 2003 Jeremy Maitin-Shepard <jbms@attbi.com> 6# Copyright 2003 Jeremy Maitin-Shepard <jbms@attbi.com>
7# Copyright 2004-2005 Mamoru Komachi <usata@gentoo.org> 7# Copyright 2004-2005 Mamoru Komachi <usata@gentoo.org>
8# Copyright 2007-2008 Christian Faulhammer <opfer@gentoo.org> 8# Copyright 2007-2008 Christian Faulhammer <fauli@gentoo.org>
9# Copyright 2007-2008 Ulrich Müller <ulm@gentoo.org> 9# Copyright 2007-2009 Ulrich Müller <ulm@gentoo.org>
10# 10#
11# @ECLASS: elisp-common.eclass 11# @ECLASS: elisp-common.eclass
12# @MAINTAINER: 12# @MAINTAINER:
13# Feel free to contact the Emacs team through <emacs@gentoo.org> if you have 13# Feel free to contact the Emacs team through <emacs@gentoo.org> if you
14# problems, suggestions or questions. 14# have problems, suggestions or questions.
15# @BLURB: Emacs-related installation utilities 15# @BLURB: Emacs-related installation utilities
16# @DESCRIPTION: 16# @DESCRIPTION:
17# 17#
18# Usually you want to use this eclass for (optional) GNU Emacs support of 18# Usually you want to use this eclass for (optional) GNU Emacs support
19# your package. This is NOT for XEmacs! 19# of your package. This is NOT for XEmacs!
20# 20#
21# Many of the steps here are sometimes done by the build system of your 21# Many of the steps here are sometimes done by the build system of your
22# package (especially compilation), so this is mainly for standalone elisp 22# package (especially compilation), so this is mainly for standalone
23# files you gathered from somewhere else. 23# elisp files you gathered from somewhere else.
24# 24#
25# When relying on the emacs USE flag, you need to add 25# When relying on the emacs USE flag, you need to add
26# 26#
27# emacs? ( virtual/emacs ) 27# emacs? ( virtual/emacs )
28# 28#
29# to your DEPEND/RDEPEND line and use the functions provided here to bring 29# to your DEPEND/RDEPEND line and use the functions provided here to
30# the files to the correct locations. 30# bring the files to the correct locations.
31# 31#
32# .SS 32# .SS
33# src_compile() usage: 33# src_compile() usage:
34# 34#
35# An elisp file is compiled by the elisp-compile() function defined here and 35# An elisp file is compiled by the elisp-compile() function defined
36# simply takes the source files as arguments. The case of interdependent 36# here and simply takes the source files as arguments. The case of
37# elisp files is also supported, since the current directory is added to the 37# interdependent elisp files is also supported, since the current
38# load-path which makes sure that all files are loadable. 38# directory is added to the load-path which makes sure that all files
39# are loadable.
39# 40#
40# elisp-compile *.el || die 41# elisp-compile *.el || die
41# 42#
42# Formerly, function elisp-comp() was used for compilation of interdependent
43# elisp files. This usage is considered as obsolete.
44#
45# Function elisp-make-autoload-file() can be used to generate a file with 43# Function elisp-make-autoload-file() can be used to generate a file
46# autoload definitions for the lisp functions. It takes the output file name 44# with autoload definitions for the lisp functions. It takes the output
47# (default: "${PN}-autoloads.el") and a list of directories (default: working 45# file name (default: "${PN}-autoloads.el") and a list of directories
48# directory) as its arguments. Use of this function requires that the elisp 46# (default: working directory) as its arguments. Use of this function
49# source files contain magic ";;;###autoload" comments. See the Emacs Lisp 47# requires that the elisp source files contain magic ";;;###autoload"
50# Reference Manual (node "Autoload") for a detailed explanation. 48# comments. See the Emacs Lisp Reference Manual (node "Autoload") for
49# a detailed explanation.
51# 50#
52# .SS 51# .SS
53# src_install() usage: 52# src_install() usage:
54# 53#
55# The resulting compiled files (.elc) should be put in a subdirectory of 54# The resulting compiled files (.elc) should be put in a subdirectory of
56# /usr/share/emacs/site-lisp/ which is named after the first argument 55# /usr/share/emacs/site-lisp/ which is named after the first argument
57# of elisp-install(). The following parameters are the files to be put in 56# of elisp-install(). The following parameters are the files to be put
58# that directory. Usually the subdirectory should be ${PN}, you can choose 57# in that directory. Usually the subdirectory should be ${PN}, you can
59# something else, but remember to tell elisp-site-file-install() (see below) 58# choose something else, but remember to tell elisp-site-file-install()
60# the change, as it defaults to ${PN}. 59# (see below) the change, as it defaults to ${PN}.
61# 60#
62# elisp-install ${PN} *.el *.elc || die 61# elisp-install ${PN} *.el *.elc || die
63# 62#
64# To let the Emacs support be activated by Emacs on startup, you need 63# To let the Emacs support be activated by Emacs on startup, you need
65# to provide a site file (shipped in ${FILESDIR}) which contains the startup 64# to provide a site file (shipped in ${FILESDIR}) which contains the
66# code (have a look in the documentation of your software). Normally this 65# startup code (have a look in the documentation of your software).
67# would look like this: 66# Normally this would look like this:
68# 67#
69# ;;; csv-mode site-lisp configuration 68# ;;; csv-mode site-lisp configuration
70# 69#
71# (add-to-list 'load-path "@SITELISP@") 70# (add-to-list 'load-path "@SITELISP@")
72# (add-to-list 'auto-mode-alist '("\\.csv\\'" . csv-mode)) 71# (add-to-list 'auto-mode-alist '("\\.csv\\'" . csv-mode))
73# (autoload 'csv-mode "csv-mode" "Major mode for csv files." t) 72# (autoload 'csv-mode "csv-mode" "Major mode for csv files." t)
74# 73#
75# If your Emacs support files are installed in a subdirectory of 74# If your Emacs support files are installed in a subdirectory of
76# /usr/share/emacs/site-lisp/ (which is recommended), you need to extend 75# /usr/share/emacs/site-lisp/ (which is strongly recommended), you need
77# Emacs' load-path as shown in the first non-comment. 76# to extend Emacs' load-path as shown in the first non-comment line.
78# The elisp-site-file-install() function of this eclass will replace 77# The elisp-site-file-install() function of this eclass will replace
79# "@SITELISP@" by the actual path. 78# "@SITELISP@" and "@SITEETC@" by the actual paths.
80# 79#
81# The next line tells Emacs to load the mode opening a file ending with 80# The next line tells Emacs to load the mode opening a file ending
82# ".csv" and load functions depending on the context and needed features. 81# with ".csv" and load functions depending on the context and needed
83# Be careful though. Commands as "load-library" or "require" bloat the 82# features. Be careful though. Commands as "load-library" or "require"
84# editor as they are loaded on every startup. When having a lot of Emacs 83# bloat the editor as they are loaded on every startup. When having
85# support files, users may be annoyed by the start-up time. Also avoid 84# many Emacs support files, users may be annoyed by the start-up time.
86# keybindings as they might interfere with the user's settings. Give a hint 85# Also avoid keybindings as they might interfere with the user's
87# in pkg_postinst(), which should be enough. 86# settings. Give a hint in pkg_postinst(), which should be enough.
88# 87#
89# The naming scheme for this site-init file matches the shell pattern 88# The naming scheme for this site-init file matches the shell pattern
90# "[1-8][0-9]*-gentoo.el", where the two digits at the beginning define the 89# "[1-8][0-9]*-gentoo*.el", where the two digits at the beginning define
91# loading order (numbers below 10 or above 89 are reserved for internal use). 90# the loading order (numbers below 10 or above 89 are reserved for
92# So if you depend on another Emacs package, your site file's number must be 91# internal use). So if your initialisation depends on another Emacs
93# higher! 92# package, your site file's number must be higher!
94# 93#
95# Best practice is to define a SITEFILE variable in the global scope of your 94# Best practice is to define a SITEFILE variable in the global scope of
96# ebuild (e.g., right after DEPEND): 95# your ebuild (e.g., right after S or RDEPEND):
97# 96#
98# SITEFILE=50${PN}-gentoo.el 97# SITEFILE="50${PN}-gentoo.el"
99# 98#
100# Which is then installed by 99# Which is then installed by
101# 100#
102# elisp-site-file-install "${FILESDIR}/${SITEFILE}" || die 101# elisp-site-file-install "${FILESDIR}/${SITEFILE}" || die
103# 102#
103# in src_install(). Any characters after the "-gentoo" part and before
104# the extension will be stripped from the destination file's name.
105# For example, a file "50${PN}-gentoo-${PV}.el" will be installed as
104# in src_install(). If your subdirectory is not named ${PN}, give the 106# "50${PN}-gentoo.el". If your subdirectory is not named ${PN}, give
105# differing name as second argument. 107# the differing name as second argument.
106# 108#
107# .SS 109# .SS
108# pkg_postinst() / pkg_postrm() usage: 110# pkg_postinst() / pkg_postrm() usage:
109# 111#
110# After that you need to recreate the start-up file of Emacs after emerging 112# After that you need to recreate the start-up file of Emacs after
111# and unmerging by using 113# emerging and unmerging by using
112# 114#
113# pkg_postinst() { 115# pkg_postinst() {
114# elisp-site-regen 116# elisp-site-regen
115# } 117# }
116# 118#
117# pkg_postrm() { 119# pkg_postrm() {
118# elisp-site-regen 120# elisp-site-regen
119# } 121# }
120# 122#
121# When having optional Emacs support, you should prepend "use emacs &&" to 123# When having optional Emacs support, you should prepend "use emacs &&"
122# above calls of elisp-site-regen(). Don't use "has_version virtual/emacs"! 124# to above calls of elisp-site-regen().
123# When unmerging the state of the emacs USE flag is taken from the package 125# Don't use "has_version virtual/emacs"! When unmerging the state of
124# database and not from the environment, so it is no problem when you unset 126# the emacs USE flag is taken from the package database and not from the
127# environment, so it is no problem when you unset USE=emacs between
125# USE=emacs between merge and unmerge of a package. 128# merge and unmerge of a package.
126# 129#
127# .SS 130# .SS
128# Miscellaneous functions: 131# Miscellaneous functions:
129# 132#
130# elisp-emacs-version() outputs the version of the currently active Emacs. 133# elisp-emacs-version() outputs the version of the currently active Emacs.
158# @FUNCTION: elisp-compile 161# @FUNCTION: elisp-compile
159# @USAGE: <list of elisp files> 162# @USAGE: <list of elisp files>
160# @DESCRIPTION: 163# @DESCRIPTION:
161# Byte-compile Emacs Lisp files. 164# Byte-compile Emacs Lisp files.
162# 165#
163# This function uses GNU Emacs to byte-compile all ".el" specified by its 166# This function uses GNU Emacs to byte-compile all ".el" specified by
164# arguments. The resulting byte-code (".elc") files are placed in the same 167# its arguments. The resulting byte-code (".elc") files are placed in
165# directory as their corresponding source file. 168# the same directory as their corresponding source file.
166# 169#
167# The current directory is added to the load-path. This will ensure that 170# The current directory is added to the load-path. This will ensure
168# interdependent Emacs Lisp files are visible between themselves, in case 171# that interdependent Emacs Lisp files are visible between themselves,
169# they require or load one another. 172# in case they require or load one another.
170 173
171elisp-compile() { 174elisp-compile() {
172 ebegin "Compiling GNU Emacs Elisp files" 175 ebegin "Compiling GNU Emacs Elisp files"
173 ${EMACS} ${EMACSFLAGS} ${BYTECOMPFLAGS} -f batch-byte-compile "$@" 176 ${EMACS} ${EMACSFLAGS} ${BYTECOMPFLAGS} -f batch-byte-compile "$@"
174 eend $? "elisp-compile: batch-byte-compile failed" 177 eend $? "elisp-compile: batch-byte-compile failed"
175} 178}
176 179
177# #FUNCTION: elisp-comp
178# #USAGE: <list of elisp files>
179# #DESCRIPTION:
180# Byte-compile interdependent Emacs Lisp files.
181# THIS FUNCTION IS DEPRECATED.
182#
183# This function byte-compiles all ".el" files which are part of its
184# arguments, using GNU Emacs, and puts the resulting ".elc" files into the
185# current directory, so disregarding the original directories used in ".el"
186# arguments.
187#
188# This function manages in such a way that all Emacs Lisp files to be
189# compiled are made visible between themselves, in the event they require or
190# load one another.
191
192elisp-comp() { 180elisp-comp() {
193 # Copyright 1995 Free Software Foundation, Inc. 181 die "Function elisp-comp is not supported any more, see bug 235442"
194 # François Pinard <pinard@iro.umontreal.ca>, 1995.
195 # Originally taken from GNU autotools.
196
197 ewarn "Function elisp-comp is deprecated and may be removed in future."
198 ewarn "Please use function elisp-compile instead, or report a bug about"
199 ewarn "${CATEGORY}/${PF} at <http://bugs.gentoo.org/>."
200 echo
201
202 [ $# -gt 0 ] || return 1
203
204 ebegin "Compiling GNU Emacs Elisp files"
205
206 local tempdir=elc.$$
207 mkdir ${tempdir}
208 cp "$@" ${tempdir}
209 pushd ${tempdir}
210
211 echo "(add-to-list 'load-path \"../\")" > script
212 ${EMACS} ${EMACSFLAGS} -l script -f batch-byte-compile *.el
213 local ret=$?
214 mv *.elc ..
215
216 popd
217 rm -fr ${tempdir}
218
219 eend ${ret} "elisp-comp: batch-byte-compile failed"
220} 182}
221 183
222# @FUNCTION: elisp-emacs-version 184# @FUNCTION: elisp-emacs-version
223# @DESCRIPTION: 185# @DESCRIPTION:
224# Output version of currently active Emacs. 186# Output version of currently active Emacs.
282} 244}
283 245
284# @FUNCTION: elisp-site-file-install 246# @FUNCTION: elisp-site-file-install
285# @USAGE: <site-init file> [subdirectory] 247# @USAGE: <site-init file> [subdirectory]
286# @DESCRIPTION: 248# @DESCRIPTION:
287# Install Emacs site-init file in SITELISP directory. 249# Install Emacs site-init file in SITELISP directory. Automatically
250# inserts a standard comment header with the name of the package (unless
251# it is already present). Tokens @SITELISP@ and @SITEETC@ are replaced
252# by the path to the package's subdirectory in SITELISP and SITEETC,
253# respectively.
288 254
289elisp-site-file-install() { 255elisp-site-file-install() {
290 local sf="${T}/${1##*/}" my_pn="${2:-${PN}}" ret 256 local sf="${1##*/}" my_pn="${2:-${PN}}" ret
257 local header=";;; ${PN} site-lisp configuration"
258
259 [[ ${sf} == [0-9][0-9]*-gentoo*.el ]] \
260 || ewarn "elisp-site-file-install: bad name of site-init file"
261 sf="${T}/${sf/%-gentoo*.el/-gentoo.el}"
291 ebegin "Installing site initialisation file for GNU Emacs" 262 ebegin "Installing site initialisation file for GNU Emacs"
292 cp "$1" "${sf}" 263 cp "$1" "${sf}"
264 sed -i -e "1{:x;/^\$/{n;bx;};/^;.*${PN}/I!s:^:${header}\n\n:;1s:^:\n:;}" \
293 sed -i -e "s:@SITELISP@:${SITELISP}/${my_pn}:g" \ 265 -e "s:@SITELISP@:${SITELISP}/${my_pn}:g" \
294 -e "s:@SITEETC@:${SITEETC}/${my_pn}:g;\$q" "${sf}" 266 -e "s:@SITEETC@:${SITEETC}/${my_pn}:g;\$q" "${sf}"
295 ( # subshell to avoid pollution of calling environment 267 ( # subshell to avoid pollution of calling environment
296 insinto "${SITELISP}/site-gentoo.d" 268 insinto "${SITELISP}/site-gentoo.d"
297 doins "${sf}" 269 doins "${sf}"
298 ) 270 )
301 eend ${ret} "elisp-site-file-install: doins failed" 273 eend ${ret} "elisp-site-file-install: doins failed"
302} 274}
303 275
304# @FUNCTION: elisp-site-regen 276# @FUNCTION: elisp-site-regen
305# @DESCRIPTION: 277# @DESCRIPTION:
306# Regenerate the site-gentoo.el file, based on packages' site initialisation 278# Regenerate the site-gentoo.el file, based on packages' site
307# files in the /usr/share/emacs/site-lisp/site-gentoo.d/ directory. 279# initialisation files in the /usr/share/emacs/site-lisp/site-gentoo.d/
280# directory.
308# 281#
309# Note: Before December 2007, site initialisation files were installed in 282# Note: Before December 2007, site initialisation files were installed
310# /usr/share/emacs/site-lisp/. For backwards compatibility, this location is 283# in /usr/share/emacs/site-lisp/. For backwards compatibility, this
311# still supported when generating site-gentoo.el. 284# location is still supported when generating site-gentoo.el.
312 285
313elisp-site-regen() { 286elisp-site-regen() {
314 local i sf line firstrun obsolete 287 local i sf line firstrun obsolete
315 local -a sflist 288 local -a sflist
316 # Work around Paludis borkage: variable T is empty in pkg_postrm
317 local tmpdir=${T:-$(mktemp -d)}
318 289
319 if [ ! -d "${ROOT}${SITELISP}" ]; then 290 if [ ! -d "${ROOT}${SITELISP}" ]; then
320 eerror "elisp-site-regen: Directory ${SITELISP} does not exist" 291 eerror "elisp-site-regen: Directory ${SITELISP} does not exist"
321 return 1 292 return 1
322 fi 293 fi
323 294
295 if [ ! -d "${T}" ]; then
296 eerror "elisp-site-regen: Temporary directory ${T} does not exist"
297 return 1
298 fi
299
324 [ -e "${ROOT}${SITELISP}"/site-gentoo.el ] || firstrun=t 300 [ -e "${ROOT}${SITELISP}"/site-gentoo.el ] \
301 || [ "${PN}" = emacs-common-gentoo ] || firstrun=t
325 302
326 if [ "${firstrun}" ] && [ ! -e "${ROOT}${SITELISP}"/site-start.el ]; then 303 if [ "${firstrun}" ] && [ ! -e "${ROOT}${SITELISP}"/site-start.el ]; then
327 einfo "Creating default ${SITELISP}/site-start.el ..." 304 einfo "Creating default site-start.el ..."
328 cat <<-EOF >"${tmpdir}"/site-start.el 305 cat <<-EOF >"${T}"/site-start.el
329 ;;; site-start.el 306 ;;; site-start.el
330 307
331 ;;; Commentary: 308 ;;; Commentary:
332 ;; This default site startup file is installed by elisp-common.eclass. 309 ;; This default site startup file is installed by elisp-common.eclass.
333 ;; You may replace this file by your own site initialisation, or even 310 ;; You may replace this file by your own site initialisation, or even
339 316
340 ;;; site-start.el ends here 317 ;;; site-start.el ends here
341 EOF 318 EOF
342 fi 319 fi
343 320
344 einfon "Regenerating ${SITELISP}/site-gentoo.el ..." 321 einfon "Regenerating site-gentoo.el (${EBUILD_PHASE}) ..."
345 322
346 # remove any auxiliary file (from previous run) 323 # Until January 2009, elisp-common.eclass sometimes created an
324 # auxiliary file for backwards compatibility. Remove any such file.
347 rm -f "${ROOT}${SITELISP}"/00site-gentoo.el 325 rm -f "${ROOT}${SITELISP}"/00site-gentoo.el
348 326
349 # set nullglob option, there may be a directory without matching files 327 # set nullglob option, there may be a directory without matching files
350 local old_shopts=$(shopt -p nullglob) 328 local old_shopts=$(shopt -p nullglob)
351 shopt -s nullglob 329 shopt -s nullglob
364 [ "${sf%/*}" = "${ROOT}${SITELISP}" ] && obsolete=t 342 [ "${sf%/*}" = "${ROOT}${SITELISP}" ] && obsolete=t
365 done 343 done
366 344
367 eval "${old_shopts}" 345 eval "${old_shopts}"
368 346
369 cat <<-EOF >"${tmpdir}"/site-gentoo.el 347 cat <<-EOF >"${T}"/site-gentoo.el
370 ;;; site-gentoo.el --- site initialisation for Gentoo-installed packages 348 ;;; site-gentoo.el --- site initialisation for Gentoo-installed packages
371 349
372 ;;; Commentary: 350 ;;; Commentary:
373 ;; Automatically generated by elisp-common.eclass 351 ;; Automatically generated by elisp-common.eclass
374 ;; DO NOT EDIT THIS FILE 352 ;; DO NOT EDIT THIS FILE
375 353
376 ;;; Code: 354 ;;; Code:
377 EOF 355 EOF
378 # Use sed instead of cat here, since files may miss a trailing newline. 356 # Use sed instead of cat here, since files may miss a trailing newline.
379 sed '$q' "${sflist[@]}" </dev/null >>"${tmpdir}"/site-gentoo.el 357 sed '$q' "${sflist[@]}" </dev/null >>"${T}"/site-gentoo.el
380 cat <<-EOF >>"${tmpdir}"/site-gentoo.el 358 cat <<-EOF >>"${T}"/site-gentoo.el
381 359
382 (provide 'site-gentoo) 360 (provide 'site-gentoo)
383 361
384 ;; Local Variables: 362 ;; Local Variables:
385 ;; no-byte-compile: t 363 ;; no-byte-compile: t
386 ;; End: 364 ;; End:
387 ;;; site-gentoo.el ends here 365 ;;; site-gentoo.el ends here
388 EOF 366 EOF
389 367
390 if cmp -s "${ROOT}${SITELISP}"/site-gentoo.el "${tmpdir}"/site-gentoo.el 368 if cmp -s "${ROOT}${SITELISP}"/site-gentoo.el "${T}"/site-gentoo.el
391 then 369 then
392 # This prevents outputting unnecessary text when there 370 # This prevents outputting unnecessary text when there
393 # was actually no change. 371 # was actually no change.
394 # A case is a remerge where we have doubled output. 372 # A case is a remerge where we have doubled output.
395 echo " no changes." 373 echo " no changes."
396 else 374 else
397 mv "${tmpdir}"/site-gentoo.el "${ROOT}${SITELISP}"/site-gentoo.el 375 mv "${T}"/site-gentoo.el "${ROOT}${SITELISP}"/site-gentoo.el
398 [ -f "${tmpdir}"/site-start.el ] \ 376 [ -f "${T}"/site-start.el ] \
399 && [ ! -e "${ROOT}${SITELISP}"/site-start.el ] \ 377 && [ ! -e "${ROOT}${SITELISP}"/site-start.el ] \
400 && mv "${tmpdir}"/site-start.el "${ROOT}${SITELISP}"/site-start.el 378 && mv "${T}"/site-start.el "${ROOT}${SITELISP}"/site-start.el
401 echo 379 echo
402 einfo "... ${#sflist[@]} site initialisation file(s) included." 380 einfo "... ${#sflist[@]} site initialisation file(s) included."
403 fi 381 fi
404 382
405 if [ "${firstrun}" ]; then 383 if [ "${firstrun}" ]; then
429 Site-initialisation files of Emacs packages are now installed in 407 Site-initialisation files of Emacs packages are now installed in
430 /usr/share/emacs/site-lisp/site-gentoo.d/. We strongly recommend 408 /usr/share/emacs/site-lisp/site-gentoo.d/. We strongly recommend
431 that you use app-admin/emacs-updater to rebuild the installed 409 that you use app-admin/emacs-updater to rebuild the installed
432 Emacs packages. 410 Emacs packages.
433 EOF 411 EOF
434
435 # Kludge for backwards compatibility: During pkg_postrm, old versions
436 # of this eclass (saved in the VDB) won't find packages' site-init
437 # files in the new location. So we copy them to an auxiliary file
438 # that is visible to old eclass versions.
439 for sf in "${sflist[@]}"; do
440 [ "${sf%/*}" = "${ROOT}${SITELISP}/site-gentoo.d" ] \
441 && cat "${sf}" >>"${ROOT}${SITELISP}"/00site-gentoo.el
442 done
443 fi 412 fi
444 413
445 # cleanup 414 # cleanup
446 rm -f "${tmpdir}"/site-{gentoo,start}.el 415 rm -f "${T}"/site-{gentoo,start}.el
447 416
448 return 0 417 return 0
449} 418}

Legend:
Removed from v.1.52  
changed lines
  Added in v.1.59

  ViewVC Help
Powered by ViewVC 1.1.20