/[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.30 Revision 1.52
1# Copyright 1999-2007 Gentoo Foundation 1# Copyright 1999-2008 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.30 2007/11/17 15:39:35 ulm Exp $ 3# $Header: /var/cvsroot/gentoo-x86/eclass/elisp-common.eclass,v 1.52 2008/11/24 14:21:04 ulm Exp $
4# 4#
5# Copyright 2007 Christian Faulhammer <opfer@gentoo.org>
6# 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>
7# Copyright 2004-2005 Mamoru Komachi <usata@gentoo.org> 7# Copyright 2004-2005 Mamoru Komachi <usata@gentoo.org>
8# Copyright 2003 Jeremy Maitin-Shepard <jbms@attbi.com> 8# Copyright 2007-2008 Christian Faulhammer <opfer@gentoo.org>
9# Copyright 2007 Ulrich Mueller <ulm@gentoo.org> 9# Copyright 2007-2008 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 have
14# problems, suggestions or questions. 14# problems, suggestions or questions.
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 here and
36# simply takes the source files as arguments. 36# simply takes the source files as arguments. The case of interdependent
37# 37# elisp files is also supported, since the current directory is added to the
38# elisp-compile *.el || die "elisp-compile failed"
39#
40# In the case of interdependent elisp files, you can use the elisp-comp()
41# function which makes sure all files are loadable. 38# load-path which makes sure that all files are loadable.
42# 39#
43# elisp-comp *.el || die "elisp-comp failed" 40# elisp-compile *.el || die
41#
42# Formerly, function elisp-comp() was used for compilation of interdependent
43# elisp files. This usage is considered as obsolete.
44# 44#
45# Function elisp-make-autoload-file() can be used to generate a file with 45# Function elisp-make-autoload-file() can be used to generate a file with
46# autoload definitions for the lisp functions. It takes the output file name 46# autoload definitions for the lisp functions. It takes the output file name
47# (default: "${PN}-autoloads.el") and a list of directories (default: working 47# (default: "${PN}-autoloads.el") and a list of directories (default: working
48# directory) as its arguments. Use of this function requires that the elisp 48# directory) as its arguments. Use of this function requires that the elisp
49# source files contain magic ";;;###autoload" comments. See the Emacs Lisp 49# source files contain magic ";;;###autoload" comments. See the Emacs Lisp
50# Reference Manual (node "Autoload") for a detailed explanation. 50# Reference Manual (node "Autoload") for a detailed explanation.
51# 51#
52# .SS 52# .SS
53# src_install() usage: 53# src_install() usage:
54# 54#
57# of elisp-install(). The following parameters are the files to be put in 57# of elisp-install(). The following parameters are the files to be put in
58# that directory. Usually the subdirectory should be ${PN}, you can choose 58# that directory. Usually the subdirectory should be ${PN}, you can choose
59# something else, but remember to tell elisp-site-file-install() (see below) 59# something else, but remember to tell elisp-site-file-install() (see below)
60# the change, as it defaults to ${PN}. 60# the change, as it defaults to ${PN}.
61# 61#
62# elisp-install ${PN} *.el *.elc || die "elisp-install failed" 62# elisp-install ${PN} *.el *.elc || die
63# 63#
64# To let the Emacs support be activated by Emacs on startup, you need 64# 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 65# to provide a site file (shipped in ${FILESDIR}) which contains the startup
66# code (have a look in the documentation of your software). Normally this 66# code (have a look in the documentation of your software). Normally this
67# would look like this: 67# would look like this:
84# editor as they are loaded on every startup. When having a lot of Emacs 84# editor as they are loaded on every startup. When having a lot of Emacs
85# support files, users may be annoyed by the start-up time. Also avoid 85# support files, users may be annoyed by the start-up time. Also avoid
86# keybindings as they might interfere with the user's settings. Give a hint 86# keybindings as they might interfere with the user's settings. Give a hint
87# in pkg_postinst(), which should be enough. 87# in pkg_postinst(), which should be enough.
88# 88#
89# The naming scheme for this site file is "[0-9][0-9]*-gentoo.el", where the 89# The naming scheme for this site-init file matches the shell pattern
90# two digits at the beginning define the loading order. So if you depend on 90# "[1-8][0-9]*-gentoo.el", where the two digits at the beginning define the
91# loading order (numbers below 10 or above 89 are reserved for internal use).
91# another Emacs package, your site file's number must be higher! 92# So if you depend on another Emacs package, your site file's number must be
93# higher!
92# 94#
93# Best practice is to define a SITEFILE variable in the global scope of your 95# Best practice is to define a SITEFILE variable in the global scope of your
94# ebuild (right after DEPEND e.g.): 96# ebuild (e.g., right after DEPEND):
95# 97#
96# SITEFILE=50${PN}-gentoo.el 98# SITEFILE=50${PN}-gentoo.el
97# 99#
98# Which is then installed by 100# Which is then installed by
99# 101#
127# 129#
128# elisp-emacs-version() outputs the version of the currently active Emacs. 130# elisp-emacs-version() outputs the version of the currently active Emacs.
129 131
130# @ECLASS-VARIABLE: SITELISP 132# @ECLASS-VARIABLE: SITELISP
131# @DESCRIPTION: 133# @DESCRIPTION:
132# Directory where Emacs Lisp files are installed. 134# Directory where packages install Emacs Lisp files.
133SITELISP=/usr/share/emacs/site-lisp 135SITELISP=/usr/share/emacs/site-lisp
134 136
135# @ECLASS-VARIABLE: SITEFILE 137# @ECLASS-VARIABLE: SITEETC
136# @DESCRIPTION: 138# @DESCRIPTION:
137# Name of package's site-init file. 139# Directory where packages install miscellaneous (not Lisp) files.
138SITEFILE=50${PN}-gentoo.el 140SITEETC=/usr/share/emacs/etc
139 141
142# @ECLASS-VARIABLE: EMACS
143# @DESCRIPTION:
144# Path of Emacs executable.
140EMACS=/usr/bin/emacs 145EMACS=/usr/bin/emacs
146
147# @ECLASS-VARIABLE: EMACSFLAGS
148# @DESCRIPTION:
149# Flags for executing Emacs in batch mode.
141# The following works for Emacs versions 18--23, don't change it. 150# These work for Emacs versions 18-23, so don't change them.
142EMACSFLAGS="-batch -q --no-site-file" 151EMACSFLAGS="-batch -q --no-site-file"
152
153# @ECLASS-VARIABLE: BYTECOMPFLAGS
154# @DESCRIPTION:
155# Emacs flags used for byte-compilation in elisp-compile().
156BYTECOMPFLAGS="-L ."
143 157
144# @FUNCTION: elisp-compile 158# @FUNCTION: elisp-compile
145# @USAGE: <list of elisp files> 159# @USAGE: <list of elisp files>
146# @DESCRIPTION: 160# @DESCRIPTION:
147# Byte-compile Emacs Lisp files. 161# Byte-compile Emacs Lisp files.
162#
163# This function uses GNU Emacs to byte-compile all ".el" specified by its
164# arguments. The resulting byte-code (".elc") files are placed in the same
165# directory as their corresponding source file.
166#
167# The current directory is added to the load-path. This will ensure that
168# interdependent Emacs Lisp files are visible between themselves, in case
169# they require or load one another.
148 170
149elisp-compile() { 171elisp-compile() {
150 einfo "Compiling GNU Emacs Elisp files ..." 172 ebegin "Compiling GNU Emacs Elisp files"
151 ${EMACS} ${EMACSFLAGS} -f batch-byte-compile "$@" 173 ${EMACS} ${EMACSFLAGS} ${BYTECOMPFLAGS} -f batch-byte-compile "$@"
174 eend $? "elisp-compile: batch-byte-compile failed"
152} 175}
153 176
154# @FUNCTION: elisp-comp 177# #FUNCTION: elisp-comp
155# @USAGE: <list of elisp files> 178# #USAGE: <list of elisp files>
156# @DESCRIPTION: 179# #DESCRIPTION:
157# Byte-compile interdependent Emacs Lisp files. 180# Byte-compile interdependent Emacs Lisp files.
181# THIS FUNCTION IS DEPRECATED.
158# 182#
159# This function byte-compiles all ".el" files which are part of its 183# This function byte-compiles all ".el" files which are part of its
160# arguments, using GNU Emacs, and puts the resulting ".elc" files into the 184# arguments, using GNU Emacs, and puts the resulting ".elc" files into the
161# current directory, so disregarding the original directories used in ".el" 185# current directory, so disregarding the original directories used in ".el"
162# arguments. 186# arguments.
168elisp-comp() { 192elisp-comp() {
169 # Copyright 1995 Free Software Foundation, Inc. 193 # Copyright 1995 Free Software Foundation, Inc.
170 # François Pinard <pinard@iro.umontreal.ca>, 1995. 194 # François Pinard <pinard@iro.umontreal.ca>, 1995.
171 # Originally taken from GNU autotools. 195 # Originally taken from GNU autotools.
172 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
173 [ $# -gt 0 ] || return 1 202 [ $# -gt 0 ] || return 1
174 203
175 einfo "Compiling GNU Emacs Elisp files ..." 204 ebegin "Compiling GNU Emacs Elisp files"
176 205
177 tempdir=elc.$$ 206 local tempdir=elc.$$
178 mkdir ${tempdir} 207 mkdir ${tempdir}
179 cp "$@" ${tempdir} 208 cp "$@" ${tempdir}
180 pushd ${tempdir} 209 pushd ${tempdir}
181 210
182 echo "(add-to-list 'load-path \"../\")" > script 211 echo "(add-to-list 'load-path \"../\")" > script
184 local ret=$? 213 local ret=$?
185 mv *.elc .. 214 mv *.elc ..
186 215
187 popd 216 popd
188 rm -fr ${tempdir} 217 rm -fr ${tempdir}
189 return ${ret} 218
219 eend ${ret} "elisp-comp: batch-byte-compile failed"
190} 220}
191 221
192# @FUNCTION: elisp-emacs-version 222# @FUNCTION: elisp-emacs-version
193# @DESCRIPTION: 223# @DESCRIPTION:
194# Output version of currently active Emacs. 224# Output version of currently active Emacs.
195 225
196elisp-emacs-version() { 226elisp-emacs-version() {
197 # The following will work for at least versions 18-23. 227 # The following will work for at least versions 18-23.
198 echo "(princ emacs-version)" >"${T}"/emacs-version.el 228 echo "(princ emacs-version)" >"${T}"/emacs-version.el
199 ${EMACS} ${EMACSFLAGS} -l "${T}"/emacs-version.el 229 ${EMACS} ${EMACSFLAGS} -l "${T}"/emacs-version.el
230 rm -f "${T}"/emacs-version.el
200} 231}
201 232
202# @FUNCTION: elisp-make-autoload-file 233# @FUNCTION: elisp-make-autoload-file
203# @USAGE: [output file] [list of directories] 234# @USAGE: [output file] [list of directories]
204# @DESCRIPTION: 235# @DESCRIPTION:
205# Generate a file with autoload definitions for the lisp functions. 236# Generate a file with autoload definitions for the lisp functions.
206 237
207elisp-make-autoload-file() { 238elisp-make-autoload-file() {
208 local f="${1:-${PN}-autoloads.el}" 239 local f="${1:-${PN}-autoloads.el}"
209 shift 240 shift
210 einfo "Generating autoload file for GNU Emacs ..." 241 ebegin "Generating autoload file for GNU Emacs"
211 242
212 sed 's/^FF/\f/' >"${f}" <<-EOF 243 sed 's/^FF/\f/' >"${f}" <<-EOF
213 ;;; ${f##*/} --- autoloads for ${P} 244 ;;; ${f##*/} --- autoloads for ${P}
214 245
215 ;;; Commentary: 246 ;;; Commentary:
228 259
229 ${EMACS} ${EMACSFLAGS} \ 260 ${EMACS} ${EMACSFLAGS} \
230 --eval "(setq make-backup-files nil)" \ 261 --eval "(setq make-backup-files nil)" \
231 --eval "(setq generated-autoload-file (expand-file-name \"${f}\"))" \ 262 --eval "(setq generated-autoload-file (expand-file-name \"${f}\"))" \
232 -f batch-update-autoloads "${@-.}" 263 -f batch-update-autoloads "${@-.}"
264
265 eend $? "elisp-make-autoload-file: batch-update-autoloads failed"
233} 266}
234 267
235# @FUNCTION: elisp-install 268# @FUNCTION: elisp-install
236# @USAGE: <subdirectory> <list of files> 269# @USAGE: <subdirectory> <list of files>
237# @DESCRIPTION: 270# @DESCRIPTION:
238# Install files in SITELISP directory. 271# Install files in SITELISP directory.
239 272
240elisp-install() { 273elisp-install() {
241 local subdir="$1" 274 local subdir="$1"
242 shift 275 shift
243 einfo "Installing Elisp files for GNU Emacs support ..." 276 ebegin "Installing Elisp files for GNU Emacs support"
244 ( # subshell to avoid pollution of calling environment 277 ( # subshell to avoid pollution of calling environment
245 insinto "${SITELISP}/${subdir}" 278 insinto "${SITELISP}/${subdir}"
246 doins "$@" 279 doins "$@"
247 ) 280 )
281 eend $? "elisp-install: doins failed"
248} 282}
249 283
250# @FUNCTION: elisp-site-file-install 284# @FUNCTION: elisp-site-file-install
251# @USAGE: <site-init file> [subdirectory] 285# @USAGE: <site-init file> [subdirectory]
252# @DESCRIPTION: 286# @DESCRIPTION:
253# Install Emacs site-init file in SITELISP directory. 287# Install Emacs site-init file in SITELISP directory.
254 288
255elisp-site-file-install() { 289elisp-site-file-install() {
256 local sf="$1" my_pn="${2:-${PN}}" 290 local sf="${T}/${1##*/}" my_pn="${2:-${PN}}" ret
257 einfo "Installing site initialisation file for GNU Emacs ..." 291 ebegin "Installing site initialisation file for GNU Emacs"
258 cp "${sf}" "${T}" 292 cp "$1" "${sf}"
259 sed -i "s:@SITELISP@:${SITELISP}/${my_pn}:g" "${T}/$(basename "${sf}")" 293 sed -i -e "s:@SITELISP@:${SITELISP}/${my_pn}:g" \
294 -e "s:@SITEETC@:${SITEETC}/${my_pn}:g;\$q" "${sf}"
260 ( # subshell to avoid pollution of calling environment 295 ( # subshell to avoid pollution of calling environment
261 insinto "${SITELISP}" 296 insinto "${SITELISP}/site-gentoo.d"
262 doins "${T}/$(basename "${sf}")" 297 doins "${sf}"
263 ) 298 )
299 ret=$?
300 rm -f "${sf}"
301 eend ${ret} "elisp-site-file-install: doins failed"
264} 302}
265 303
266# @FUNCTION: elisp-site-regen 304# @FUNCTION: elisp-site-regen
267# @DESCRIPTION: 305# @DESCRIPTION:
268# Regenerate site-gentoo.el file. 306# Regenerate the site-gentoo.el file, based on packages' site initialisation
307# files in the /usr/share/emacs/site-lisp/site-gentoo.d/ directory.
308#
309# Note: Before December 2007, site initialisation files were installed in
310# /usr/share/emacs/site-lisp/. For backwards compatibility, this location is
311# still supported when generating site-gentoo.el.
269 312
270elisp-site-regen() { 313elisp-site-regen() {
271 local sflist sf line 314 local i sf line firstrun obsolete
315 local -a sflist
316 # Work around Paludis borkage: variable T is empty in pkg_postrm
317 local tmpdir=${T:-$(mktemp -d)}
272 318
319 if [ ! -d "${ROOT}${SITELISP}" ]; then
320 eerror "elisp-site-regen: Directory ${SITELISP} does not exist"
321 return 1
322 fi
323
273 if [ ! -e "${ROOT}${SITELISP}"/site-gentoo.el ] \ 324 [ -e "${ROOT}${SITELISP}"/site-gentoo.el ] || firstrun=t
325
274 && [ ! -e "${ROOT}${SITELISP}"/site-start.el ]; then 326 if [ "${firstrun}" ] && [ ! -e "${ROOT}${SITELISP}"/site-start.el ]; then
275 einfo "Creating default ${SITELISP}/site-start.el ..." 327 einfo "Creating default ${SITELISP}/site-start.el ..."
276 cat <<-EOF >"${T}"/site-start.el 328 cat <<-EOF >"${tmpdir}"/site-start.el
277 ;;; site-start.el 329 ;;; site-start.el
278 330
279 ;;; Commentary: 331 ;;; Commentary:
280 ;; This default site startup file is installed by elisp-common.eclass. 332 ;; This default site startup file is installed by elisp-common.eclass.
281 ;; You may replace this file by your own site initialisation, or even 333 ;; You may replace this file by your own site initialisation, or even
288 ;;; site-start.el ends here 340 ;;; site-start.el ends here
289 EOF 341 EOF
290 fi 342 fi
291 343
292 einfon "Regenerating ${SITELISP}/site-gentoo.el ..." 344 einfon "Regenerating ${SITELISP}/site-gentoo.el ..."
345
346 # remove any auxiliary file (from previous run)
347 rm -f "${ROOT}${SITELISP}"/00site-gentoo.el
348
349 # set nullglob option, there may be a directory without matching files
350 local old_shopts=$(shopt -p nullglob)
351 shopt -s nullglob
352
353 for sf in "${ROOT}${SITELISP}"/[0-9][0-9]*-gentoo.el \
354 "${ROOT}${SITELISP}"/site-gentoo.d/[0-9][0-9]*.el
355 do
356 [ -r "${sf}" ] || continue
357 # sort files by their basename. straight insertion sort.
358 for ((i=${#sflist[@]}; i>0; i--)); do
359 [[ ${sf##*/} < ${sflist[i-1]##*/} ]] || break
360 sflist[i]=${sflist[i-1]}
361 done
362 sflist[i]=${sf}
363 # set a flag if there are obsolete files
364 [ "${sf%/*}" = "${ROOT}${SITELISP}" ] && obsolete=t
365 done
366
367 eval "${old_shopts}"
368
293 cat <<-EOF >"${T}"/site-gentoo.el 369 cat <<-EOF >"${tmpdir}"/site-gentoo.el
294 ;;; site-gentoo.el --- site initialisation for Gentoo-installed packages 370 ;;; site-gentoo.el --- site initialisation for Gentoo-installed packages
295 371
296 ;;; Commentary: 372 ;;; Commentary:
297 ;; Automatically generated by elisp-common.eclass 373 ;; Automatically generated by elisp-common.eclass
298 ;; DO NOT EDIT THIS FILE 374 ;; DO NOT EDIT THIS FILE
299 375
300 ;;; Code: 376 ;;; Code:
301 EOF 377 EOF
302 378 # Use sed instead of cat here, since files may miss a trailing newline.
303 for sf in "${ROOT}${SITELISP}"/[0-9][0-9]*-gentoo.el 379 sed '$q' "${sflist[@]}" </dev/null >>"${tmpdir}"/site-gentoo.el
304 do
305 [ -r "${sf}" ] || continue
306 sflist="${sflist} $(basename "${sf}")"
307 cat "${sf}" >>"${T}"/site-gentoo.el
308 done
309
310 cat <<-EOF >>"${T}"/site-gentoo.el 380 cat <<-EOF >>"${tmpdir}"/site-gentoo.el
311 381
312 (provide 'site-gentoo) 382 (provide 'site-gentoo)
313 383
314 ;; Local Variables: 384 ;; Local Variables:
315 ;; no-byte-compile: t 385 ;; no-byte-compile: t
316 ;; End: 386 ;; End:
317 ;;; site-gentoo.el ends here 387 ;;; site-gentoo.el ends here
318 EOF 388 EOF
319 389
320 if cmp -s "${ROOT}${SITELISP}"/site-gentoo.el "${T}"/site-gentoo.el; then 390 if cmp -s "${ROOT}${SITELISP}"/site-gentoo.el "${tmpdir}"/site-gentoo.el
391 then
321 # This prevents outputting unnecessary text when there 392 # This prevents outputting unnecessary text when there
322 # was actually no change. 393 # was actually no change.
323 # A case is a remerge where we have doubled output. 394 # A case is a remerge where we have doubled output.
324 echo " no changes." 395 echo " no changes."
325 else 396 else
326 mv "${T}"/site-gentoo.el "${ROOT}${SITELISP}"/site-gentoo.el 397 mv "${tmpdir}"/site-gentoo.el "${ROOT}${SITELISP}"/site-gentoo.el
327 [ -f "${T}"/site-start.el ] \ 398 [ -f "${tmpdir}"/site-start.el ] \
328 && [ ! -e "${ROOT}${SITELISP}"/site-start.el ] \ 399 && [ ! -e "${ROOT}${SITELISP}"/site-start.el ] \
329 && mv "${T}"/site-start.el "${ROOT}${SITELISP}"/site-start.el 400 && mv "${tmpdir}"/site-start.el "${ROOT}${SITELISP}"/site-start.el
330 echo; einfo 401 echo
331 for sf in ${sflist}; do 402 einfo "... ${#sflist[@]} site initialisation file(s) included."
332 einfo " Adding ${sf} ..." 403 fi
333 done 404
405 if [ "${firstrun}" ]; then
406 echo
334 while read line; do einfo "${line}"; done <<EOF 407 while read line; do einfo "${line:- }"; done <<-EOF
335
336All site initialisation for Gentoo-installed packages is added to 408 All site initialisation for Gentoo-installed packages is added to
337/usr/share/emacs/site-lisp/site-gentoo.el; site-start.el is no longer 409 /usr/share/emacs/site-lisp/site-gentoo.el; site-start.el is not
338managed by Gentoo. You are responsible for all maintenance of 410 managed by Gentoo. You are responsible for all maintenance of
339site-start.el if there is such a file. 411 site-start.el if there is such a file.
340 412
341In order for this site initialisation to be loaded for all users 413 In order for this site initialisation to be loaded for all users
342automatically, you can add a line like this: 414 automatically, you can add a line like this:
343 415
344 (require 'site-gentoo) 416 (require 'site-gentoo)
345 417
346to /usr/share/emacs/site-lisp/site-start.el. Alternatively, that line 418 to /usr/share/emacs/site-lisp/site-start.el. Alternatively, that line
347can be added by individual users to their initialisation files, or for 419 can be added by individual users to their initialisation files, or,
348greater flexibility, users can select which of the package-specific 420 for greater flexibility, users can load individual package-specific
349initialisation files in /usr/share/emacs/site-lisp/ to load. 421 initialisation files from /usr/share/emacs/site-lisp/site-gentoo.d/.
350EOF 422 EOF
351 echo 423 echo
352 fi 424 fi
425
426 if [ "${obsolete}" ]; then
427 echo
428 while read line; do ewarn "${line}"; done <<-EOF
429 Site-initialisation files of Emacs packages are now installed in
430 /usr/share/emacs/site-lisp/site-gentoo.d/. We strongly recommend
431 that you use app-admin/emacs-updater to rebuild the installed
432 Emacs packages.
433 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
444
445 # cleanup
446 rm -f "${tmpdir}"/site-{gentoo,start}.el
447
448 return 0
353} 449}

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

  ViewVC Help
Powered by ViewVC 1.1.20