| 1 | # Copyright 1999-2003 Gentoo Technologies, Inc. |
1 | # Copyright 1999-2004 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/eutils.eclass,v 1.25 2003/03/03 21:42:05 vapier Exp $ |
3 | # $Header: /var/cvsroot/gentoo-x86/eclass/eutils.eclass,v 1.92 2004/08/03 17:24:52 vapier Exp $ |
| 4 | # |
4 | # |
| 5 | # Author: Martin Schlemmer <azarah@gentoo.org> |
5 | # Author: Martin Schlemmer <azarah@gentoo.org> |
| 6 | # |
6 | # |
| 7 | # This eclass is for general purpose functions that most ebuilds |
7 | # This eclass is for general purpose functions that most ebuilds |
| 8 | # have to implement themselves. |
8 | # have to implement themselves. |
| … | |
… | |
| 10 | # NB: If you add anything, please comment it! |
10 | # NB: If you add anything, please comment it! |
| 11 | |
11 | |
| 12 | ECLASS=eutils |
12 | ECLASS=eutils |
| 13 | INHERITED="$INHERITED $ECLASS" |
13 | INHERITED="$INHERITED $ECLASS" |
| 14 | |
14 | |
| 15 | newdepend "!bootstrap? ( sys-devel/patch )" |
15 | DEPEND="!bootstrap? ( sys-devel/patch )" |
| 16 | |
16 | |
| 17 | DESCRIPTION="Based on the ${ECLASS} eclass" |
17 | DESCRIPTION="Based on the ${ECLASS} eclass" |
| 18 | |
18 | |
| 19 | # This function generate linker scripts in /usr/lib for dynamic |
19 | # This function generate linker scripts in /usr/lib for dynamic |
| 20 | # libs in /lib. This is to fix linking problems when you have |
20 | # libs in /lib. This is to fix linking problems when you have |
| … | |
… | |
| 36 | # |
36 | # |
| 37 | gen_usr_ldscript() { |
37 | gen_usr_ldscript() { |
| 38 | |
38 | |
| 39 | # Just make sure it exists |
39 | # Just make sure it exists |
| 40 | dodir /usr/lib |
40 | dodir /usr/lib |
| 41 | |
41 | |
| 42 | cat > ${D}/usr/lib/$1 <<"END_LDSCRIPT" |
42 | cat > ${D}/usr/lib/$1 <<"END_LDSCRIPT" |
| 43 | /* GNU ld script |
43 | /* GNU ld script |
| 44 | Because Gentoo have critical dynamic libraries |
44 | Because Gentoo have critical dynamic libraries |
| 45 | in /lib, and the static versions in /usr/lib, we |
45 | in /lib, and the static versions in /usr/lib, we |
| 46 | need to have a "fake" dynamic lib in /usr/lib, |
46 | need to have a "fake" dynamic lib in /usr/lib, |
| … | |
… | |
| 70 | return 0 |
70 | return 0 |
| 71 | fi |
71 | fi |
| 72 | |
72 | |
| 73 | # Get the length of $* |
73 | # Get the length of $* |
| 74 | str_length="$(echo -n "$*" | wc -m)" |
74 | str_length="$(echo -n "$*" | wc -m)" |
| 75 | |
75 | |
| 76 | while [ "$i" -lt "${str_length}" ] |
76 | while [ "$i" -lt "${str_length}" ] |
| 77 | do |
77 | do |
| 78 | echo -n "=" |
78 | echo -n "=" |
| 79 | |
79 | |
| 80 | i=$((i + 1)) |
80 | i=$((i + 1)) |
| 81 | done |
81 | done |
| 82 | |
82 | |
| 83 | echo |
83 | echo |
| 84 | |
84 | |
| … | |
… | |
| 88 | # Default directory where patches are located |
88 | # Default directory where patches are located |
| 89 | EPATCH_SOURCE="${WORKDIR}/patch" |
89 | EPATCH_SOURCE="${WORKDIR}/patch" |
| 90 | # Default extension for patches |
90 | # Default extension for patches |
| 91 | EPATCH_SUFFIX="patch.bz2" |
91 | EPATCH_SUFFIX="patch.bz2" |
| 92 | # Default options for patch |
92 | # Default options for patch |
|
|
93 | # Set -g0 to keep RCS, ClearCase, Perforce and SCCS happy. Bug #24571 |
| 93 | EPATCH_OPTS="" |
94 | EPATCH_OPTS="-g0" |
| 94 | # List of patches not to apply. Not this is only file names, |
95 | # List of patches not to apply. Not this is only file names, |
| 95 | # and not the full path .. |
96 | # and not the full path .. |
| 96 | EPATCH_EXCLUDE="" |
97 | EPATCH_EXCLUDE="" |
| 97 | # Change the printed message for a single patch. |
98 | # Change the printed message for a single patch. |
| 98 | EPATCH_SINGLE_MSG="" |
99 | EPATCH_SINGLE_MSG="" |
|
|
100 | # Force applying bulk patches even if not following the style: |
|
|
101 | # |
|
|
102 | # ??_${ARCH}_foo.${EPATCH_SUFFIX} |
|
|
103 | # |
|
|
104 | EPATCH_FORCE="no" |
| 99 | |
105 | |
| 100 | # This function is for bulk patching, or in theory for just one |
106 | # This function is for bulk patching, or in theory for just one |
| 101 | # or two patches. |
107 | # or two patches. |
| 102 | # |
108 | # |
| 103 | # It should work with .bz2, .gz, .zip and plain text patches. |
109 | # It should work with .bz2, .gz, .zip and plain text patches. |
| … | |
… | |
| 145 | fi |
151 | fi |
| 146 | |
152 | |
| 147 | if [ -n "$1" -a -f "$1" ] |
153 | if [ -n "$1" -a -f "$1" ] |
| 148 | then |
154 | then |
| 149 | SINGLE_PATCH="yes" |
155 | SINGLE_PATCH="yes" |
| 150 | |
156 | |
| 151 | local EPATCH_SOURCE="$1" |
157 | local EPATCH_SOURCE="$1" |
| 152 | local EPATCH_SUFFIX="${1##*\.}" |
158 | local EPATCH_SUFFIX="${1##*\.}" |
| 153 | |
159 | |
| 154 | elif [ -n "$1" -a -d "$1" ] |
160 | elif [ -n "$1" -a -d "$1" ] |
| 155 | then |
161 | then |
|
|
162 | # Allow no extension if EPATCH_FORCE=yes ... used by vim for example ... |
|
|
163 | if [ "${EPATCH_FORCE}" = "yes" ] && [ -z "${EPATCH_SUFFIX}" ] |
|
|
164 | then |
|
|
165 | local EPATCH_SOURCE="$1/*" |
|
|
166 | else |
| 156 | local EPATCH_SOURCE="$1/*.${EPATCH_SUFFIX}" |
167 | local EPATCH_SOURCE="$1/*.${EPATCH_SUFFIX}" |
|
|
168 | fi |
| 157 | else |
169 | else |
| 158 | if [ ! -d ${EPATCH_SOURCE} ] |
170 | if [ ! -d ${EPATCH_SOURCE} ] |
| 159 | then |
171 | then |
| 160 | if [ -n "$1" -a "${EPATCH_SOURCE}" = "${WORKDIR}/patch" ] |
172 | if [ -n "$1" -a "${EPATCH_SOURCE}" = "${WORKDIR}/patch" ] |
| 161 | then |
173 | then |
| … | |
… | |
| 167 | eerror |
179 | eerror |
| 168 | eerror " ${EPATCH_SOURCE}" |
180 | eerror " ${EPATCH_SOURCE}" |
| 169 | echo |
181 | echo |
| 170 | die "Cannot find \$EPATCH_SOURCE!" |
182 | die "Cannot find \$EPATCH_SOURCE!" |
| 171 | fi |
183 | fi |
| 172 | |
184 | |
| 173 | local EPATCH_SOURCE="${EPATCH_SOURCE}/*.${EPATCH_SUFFIX}" |
185 | local EPATCH_SOURCE="${EPATCH_SOURCE}/*.${EPATCH_SUFFIX}" |
| 174 | fi |
186 | fi |
| 175 | |
187 | |
| 176 | case ${EPATCH_SUFFIX##*\.} in |
188 | case ${EPATCH_SUFFIX##*\.} in |
| 177 | bz2) |
189 | bz2) |
| … | |
… | |
| 201 | # New ARCH dependant patch naming scheme... |
213 | # New ARCH dependant patch naming scheme... |
| 202 | # |
214 | # |
| 203 | # ???_arch_foo.patch |
215 | # ???_arch_foo.patch |
| 204 | # |
216 | # |
| 205 | if [ -f ${x} ] && \ |
217 | if [ -f ${x} ] && \ |
| 206 | [ "${SINGLE_PATCH}" = "yes" -o "${x/_all_}" != "${x}" -o "`eval echo \$\{x/_${ARCH}_\}`" != "${x}" ] |
218 | ([ "${SINGLE_PATCH}" = "yes" -o "${x/_all_}" != "${x}" -o "`eval echo \$\{x/_${ARCH}_\}`" != "${x}" ] || \ |
|
|
219 | [ "${EPATCH_FORCE}" = "yes" ]) |
| 207 | then |
220 | then |
| 208 | local count=0 |
221 | local count=0 |
| 209 | local popts="${EPATCH_OPTS}" |
222 | local popts="${EPATCH_OPTS}" |
| 210 | |
223 | |
| 211 | if [ -n "${EPATCH_EXCLUDE}" ] |
224 | if [ -n "${EPATCH_EXCLUDE}" ] |
| … | |
… | |
| 213 | if [ "`eval echo \$\{EPATCH_EXCLUDE/${x##*/}\}`" != "${EPATCH_EXCLUDE}" ] |
226 | if [ "`eval echo \$\{EPATCH_EXCLUDE/${x##*/}\}`" != "${EPATCH_EXCLUDE}" ] |
| 214 | then |
227 | then |
| 215 | continue |
228 | continue |
| 216 | fi |
229 | fi |
| 217 | fi |
230 | fi |
| 218 | |
231 | |
| 219 | if [ "${SINGLE_PATCH}" = "yes" ] |
232 | if [ "${SINGLE_PATCH}" = "yes" ] |
| 220 | then |
233 | then |
| 221 | if [ -n "${EPATCH_SINGLE_MSG}" ] |
234 | if [ -n "${EPATCH_SINGLE_MSG}" ] |
| 222 | then |
235 | then |
| 223 | einfo "${EPATCH_SINGLE_MSG}" |
236 | einfo "${EPATCH_SINGLE_MSG}" |
| … | |
… | |
| 243 | echo -n "PIPE_COMMAND: " >> ${STDERR_TARGET%/*}/${x##*/}-${STDERR_TARGET##*/} |
256 | echo -n "PIPE_COMMAND: " >> ${STDERR_TARGET%/*}/${x##*/}-${STDERR_TARGET##*/} |
| 244 | echo "${PIPE_CMD} ${x} > ${PATCH_TARGET}" >> ${STDERR_TARGET%/*}/${x##*/}-${STDERR_TARGET##*/} |
257 | echo "${PIPE_CMD} ${x} > ${PATCH_TARGET}" >> ${STDERR_TARGET%/*}/${x##*/}-${STDERR_TARGET##*/} |
| 245 | else |
258 | else |
| 246 | PATCH_TARGET="${x}" |
259 | PATCH_TARGET="${x}" |
| 247 | fi |
260 | fi |
| 248 | |
261 | |
| 249 | echo -n "PATCH COMMAND: " >> ${STDERR_TARGET%/*}/${x##*/}-${STDERR_TARGET##*/} |
262 | echo -n "PATCH COMMAND: " >> ${STDERR_TARGET%/*}/${x##*/}-${STDERR_TARGET##*/} |
| 250 | echo "patch ${popts} -p${count} < ${PATCH_TARGET}" >> ${STDERR_TARGET%/*}/${x##*/}-${STDERR_TARGET##*/} |
263 | echo "patch -p${count} ${popts} < ${PATCH_TARGET}" >> ${STDERR_TARGET%/*}/${x##*/}-${STDERR_TARGET##*/} |
| 251 | |
264 | |
| 252 | echo >> ${STDERR_TARGET%/*}/${x##*/}-${STDERR_TARGET##*/} |
265 | echo >> ${STDERR_TARGET%/*}/${x##*/}-${STDERR_TARGET##*/} |
| 253 | draw_line "***** ${x##*/} *****" >> ${STDERR_TARGET%/*}/${x##*/}-${STDERR_TARGET##*/} |
266 | draw_line "***** ${x##*/} *****" >> ${STDERR_TARGET%/*}/${x##*/}-${STDERR_TARGET##*/} |
| 254 | |
267 | |
| 255 | if [ "${PATCH_SUFFIX}" != "patch" ] |
268 | if [ "${PATCH_SUFFIX}" != "patch" ] |
| 256 | then |
269 | then |
| … | |
… | |
| 261 | #die "Could not extract patch!" |
274 | #die "Could not extract patch!" |
| 262 | count=5 |
275 | count=5 |
| 263 | break |
276 | break |
| 264 | fi |
277 | fi |
| 265 | fi |
278 | fi |
| 266 | |
279 | |
| 267 | if (cat ${PATCH_TARGET} | patch ${popts} --dry-run -f -p${count}) >> ${STDERR_TARGET%/*}/${x##*/}-${STDERR_TARGET##*/} 2>&1 |
280 | if (cat ${PATCH_TARGET} | patch -p${count} ${popts} --dry-run -f) >> ${STDERR_TARGET%/*}/${x##*/}-${STDERR_TARGET##*/} 2>&1 |
| 268 | then |
281 | then |
| 269 | draw_line "***** ${x##*/} *****" > ${STDERR_TARGET%/*}/${x##*/}-${STDERR_TARGET##*/}.real |
282 | draw_line "***** ${x##*/} *****" > ${STDERR_TARGET%/*}/${x##*/}-${STDERR_TARGET##*/}.real |
| 270 | echo >> ${STDERR_TARGET%/*}/${x##*/}-${STDERR_TARGET##*/}.real |
283 | echo >> ${STDERR_TARGET%/*}/${x##*/}-${STDERR_TARGET##*/}.real |
| 271 | echo "ACTUALLY APPLYING ${x##*/}..." >> ${STDERR_TARGET%/*}/${x##*/}-${STDERR_TARGET##*/}.real |
284 | echo "ACTUALLY APPLYING ${x##*/}..." >> ${STDERR_TARGET%/*}/${x##*/}-${STDERR_TARGET##*/}.real |
| 272 | echo >> ${STDERR_TARGET%/*}/${x##*/}-${STDERR_TARGET##*/}.real |
285 | echo >> ${STDERR_TARGET%/*}/${x##*/}-${STDERR_TARGET##*/}.real |
| 273 | draw_line "***** ${x##*/} *****" >> ${STDERR_TARGET%/*}/${x##*/}-${STDERR_TARGET##*/}.real |
286 | draw_line "***** ${x##*/} *****" >> ${STDERR_TARGET%/*}/${x##*/}-${STDERR_TARGET##*/}.real |
| 274 | |
287 | |
| 275 | cat ${PATCH_TARGET} | patch ${popts} -p${count} >> ${STDERR_TARGET%/*}/${x##*/}-${STDERR_TARGET##*/}.real 2>&1 |
288 | cat ${PATCH_TARGET} | patch -p${count} ${popts} >> ${STDERR_TARGET%/*}/${x##*/}-${STDERR_TARGET##*/}.real 2>&1 |
| 276 | |
289 | |
| 277 | if [ "$?" -ne 0 ] |
290 | if [ "$?" -ne 0 ] |
| 278 | then |
291 | then |
| 279 | cat ${STDERR_TARGET%/*}/${x##*/}-${STDERR_TARGET##*/}.real >> ${STDERR_TARGET%/*}/${x##*/}-${STDERR_TARGET##*/} |
292 | cat ${STDERR_TARGET%/*}/${x##*/}-${STDERR_TARGET##*/}.real >> ${STDERR_TARGET%/*}/${x##*/}-${STDERR_TARGET##*/} |
| 280 | echo |
293 | echo |
| … | |
… | |
| 283 | #die "Real world sux compared to the dreamworld!" |
296 | #die "Real world sux compared to the dreamworld!" |
| 284 | count=5 |
297 | count=5 |
| 285 | fi |
298 | fi |
| 286 | |
299 | |
| 287 | rm -f ${STDERR_TARGET%/*}/${x##*/}-${STDERR_TARGET##*/}.real |
300 | rm -f ${STDERR_TARGET%/*}/${x##*/}-${STDERR_TARGET##*/}.real |
| 288 | |
301 | |
| 289 | break |
302 | break |
| 290 | fi |
303 | fi |
| 291 | |
304 | |
| 292 | count=$((count + 1)) |
305 | count=$((count + 1)) |
| 293 | done |
306 | done |
| … | |
… | |
| 318 | then |
331 | then |
| 319 | einfo "Done with patching" |
332 | einfo "Done with patching" |
| 320 | fi |
333 | fi |
| 321 | } |
334 | } |
| 322 | |
335 | |
|
|
336 | # This function return true if we are using the NPTL pthreads |
|
|
337 | # implementation. |
|
|
338 | # |
|
|
339 | # <azarah@gentoo.org> (06 March 2003) |
|
|
340 | # |
|
|
341 | |
|
|
342 | have_NPTL() { |
|
|
343 | |
|
|
344 | cat > ${T}/test-nptl.c <<-"END" |
|
|
345 | #define _XOPEN_SOURCE |
|
|
346 | #include <unistd.h> |
|
|
347 | #include <stdio.h> |
|
|
348 | |
|
|
349 | int main() |
|
|
350 | { |
|
|
351 | char buf[255]; |
|
|
352 | char *str = buf; |
|
|
353 | |
|
|
354 | confstr(_CS_GNU_LIBPTHREAD_VERSION, str, 255); |
|
|
355 | if (NULL != str) { |
|
|
356 | printf("%s\n", str); |
|
|
357 | if (NULL != strstr(str, "NPTL")) |
|
|
358 | return 0; |
|
|
359 | } |
|
|
360 | |
|
|
361 | return 1; |
|
|
362 | } |
|
|
363 | END |
|
|
364 | |
|
|
365 | einfon "Checking for _CS_GNU_LIBPTHREAD_VERSION support in glibc ... " |
|
|
366 | if gcc -o ${T}/nptl ${T}/test-nptl.c &> /dev/null |
|
|
367 | then |
|
|
368 | echo "yes" |
|
|
369 | einfon "Checking what PTHREADS implementation we have ... " |
|
|
370 | if ${T}/nptl |
|
|
371 | then |
|
|
372 | return 0 |
|
|
373 | else |
|
|
374 | return 1 |
|
|
375 | fi |
|
|
376 | else |
|
|
377 | echo "no" |
|
|
378 | fi |
|
|
379 | |
|
|
380 | return 1 |
|
|
381 | } |
|
|
382 | |
| 323 | # This function check how many cpu's are present, and then set |
383 | # This function check how many cpu's are present, and then set |
| 324 | # -j in MAKEOPTS accordingly. |
384 | # -j in MAKEOPTS accordingly. |
| 325 | # |
385 | # |
| 326 | # Thanks to nall <nall@gentoo.org> for this. |
386 | # Thanks to nall <nall@gentoo.org> for this. |
| 327 | # |
387 | # |
| … | |
… | |
| 340 | ADMINPARAM="`echo ${ADMINOPTS} | gawk '{match($0, /-j *[0-9]*/, opt); print opt[0]}'`" |
400 | ADMINPARAM="`echo ${ADMINOPTS} | gawk '{match($0, /-j *[0-9]*/, opt); print opt[0]}'`" |
| 341 | ADMINPARAM="${ADMINPARAM/-j}" |
401 | ADMINPARAM="${ADMINPARAM/-j}" |
| 342 | fi |
402 | fi |
| 343 | |
403 | |
| 344 | export MAKEOPTS="`echo ${MAKEOPTS} | sed -e 's:-j *[0-9]*::g'`" |
404 | export MAKEOPTS="`echo ${MAKEOPTS} | sed -e 's:-j *[0-9]*::g'`" |
| 345 | |
405 | |
| 346 | if [ "${ARCH}" = "x86" -o "${ARCH}" = "hppa" -o \ |
406 | if [ "${ARCH}" = "amd64" -o "${ARCH}" = "x86" -o "${ARCH}" = "hppa" -o \ |
| 347 | "${ARCH}" = "arm" -o "${ARCH}" = "mips" ] |
407 | "${ARCH}" = "arm" -o "${ARCH}" = "mips" -o "${ARCH}" = "ia64" ] |
| 348 | then |
408 | then |
| 349 | # these archs will always have "[Pp]rocessor" |
409 | # these archs will always have "[Pp]rocessor" |
| 350 | jobs="$((`grep -c ^[Pp]rocessor /proc/cpuinfo` * 2))" |
410 | jobs="$((`grep -c ^[Pp]rocessor /proc/cpuinfo` * 2))" |
| 351 | |
411 | |
| 352 | elif [ "${ARCH}" = "sparc" -o "${ARCH}" = "sparc64" ] |
412 | elif [ "${ARCH}" = "sparc" -o "${ARCH}" = "sparc64" ] |
| 353 | then |
413 | then |
| 354 | # sparc always has "ncpus active" |
414 | # sparc always has "ncpus active" |
| 355 | jobs="$((`grep "^ncpus active" /proc/cpuinfo | sed -e "s/^.*: //"` * 2))" |
415 | jobs="$((`grep "^ncpus active" /proc/cpuinfo | sed -e "s/^.*: //"` * 2))" |
| 356 | |
416 | |
| 357 | elif [ "${ARCH}" = "alpha" ] |
417 | elif [ "${ARCH}" = "alpha" ] |
| 358 | then |
418 | then |
| 359 | # alpha has "cpus active", but only when compiled with SMP |
419 | # alpha has "cpus active", but only when compiled with SMP |
| 360 | if [ "`grep -c "^cpus active" /proc/cpuinfo`" -eq 1 ] |
420 | if [ "`grep -c "^cpus active" /proc/cpuinfo`" -eq 1 ] |
| 361 | then |
421 | then |
| 362 | jobs="$((`grep "^cpus active" /proc/cpuinfo | sed -e "s/^.*: //"` * 2))" |
422 | jobs="$((`grep "^cpus active" /proc/cpuinfo | sed -e "s/^.*: //"` * 2))" |
| 363 | else |
423 | else |
| 364 | jobs=2 |
424 | jobs=2 |
| 365 | fi |
425 | fi |
| 366 | |
426 | |
| 367 | elif [ "${ARCH}" = "ppc" ] |
427 | elif [ "${ARCH}" = "ppc" -o "${ARCH}" = "ppc64" ] |
| 368 | then |
428 | then |
| 369 | # ppc has "processor", but only when compiled with SMP |
429 | # ppc has "processor", but only when compiled with SMP |
| 370 | if [ "`grep -c "^processor" /proc/cpuinfo`" -eq 1 ] |
430 | if [ "`grep -c "^processor" /proc/cpuinfo`" -eq 1 ] |
| 371 | then |
431 | then |
| 372 | jobs="$((`grep -c ^processor /proc/cpuinfo` * 2))" |
432 | jobs="$((`grep -c ^processor /proc/cpuinfo` * 2))" |
| 373 | else |
433 | else |
| 374 | jobs=2 |
434 | jobs=2 |
| 375 | fi |
435 | fi |
|
|
436 | elif [ "${ARCH}" = "s390" ] |
|
|
437 | then |
|
|
438 | # s390 has "# processors : " |
|
|
439 | jobs="$((`grep "^\# processors" /proc/cpuinfo | sed -e "s/^.*: //"` * 2))" |
| 376 | else |
440 | else |
| 377 | jobs="$((`grep -c ^cpu /proc/cpuinfo` * 2))" |
441 | jobs="$((`grep -c ^cpu /proc/cpuinfo` * 2))" |
| 378 | die "Unknown ARCH -- ${ARCH}!" |
442 | die "Unknown ARCH -- ${ARCH}!" |
| 379 | fi |
443 | fi |
| 380 | |
444 | |
| 381 | # Make sure the number is valid ... |
445 | # Make sure the number is valid ... |
| 382 | if [ "${jobs}" -lt 1 ] |
446 | if [ "${jobs}" -lt 1 ] |
| 383 | then |
447 | then |
| 384 | jobs=1 |
448 | jobs=1 |
| 385 | fi |
449 | fi |
| 386 | |
450 | |
| 387 | if [ -n "${ADMINPARAM}" ] |
451 | if [ -n "${ADMINPARAM}" ] |
| 388 | then |
452 | then |
| 389 | if [ "${jobs}" -gt "${ADMINPARAM}" ] |
453 | if [ "${jobs}" -gt "${ADMINPARAM}" ] |
| 390 | then |
454 | then |
| 391 | einfo "Setting make jobs to \"-j${ADMINPARAM}\" to ensure successful merge..." |
455 | einfo "Setting make jobs to \"-j${ADMINPARAM}\" to ensure successful merge..." |
| … | |
… | |
| 395 | export MAKEOPTS="${MAKEOPTS} -j${jobs}" |
459 | export MAKEOPTS="${MAKEOPTS} -j${jobs}" |
| 396 | fi |
460 | fi |
| 397 | fi |
461 | fi |
| 398 | } |
462 | } |
| 399 | |
463 | |
|
|
464 | # Cheap replacement for when debianutils (and thus mktemp) |
|
|
465 | # does not exist on the users system |
|
|
466 | # vapier@gentoo.org |
|
|
467 | # |
|
|
468 | # Takes just 1 parameter (the directory to create tmpfile in) |
|
|
469 | mymktemp() { |
|
|
470 | local topdir="$1" |
|
|
471 | |
|
|
472 | [ -z "${topdir}" ] && topdir=/tmp |
|
|
473 | if [ "`which mktemp 2>/dev/null`" ] |
|
|
474 | then |
|
|
475 | mktemp -p ${topdir} |
|
|
476 | else |
|
|
477 | local tmp="${topdir}/tmp.${RANDOM}.${RANDOM}.${RANDOM}" |
|
|
478 | touch ${tmp} |
|
|
479 | echo ${tmp} |
|
|
480 | fi |
|
|
481 | } |
|
|
482 | |
|
|
483 | # Small wrapper for getent (Linux) and nidump (Mac OS X) |
|
|
484 | # used in enewuser()/enewgroup() |
|
|
485 | # Joe Jezak <josejx@gmail.com> and usata@gentoo.org |
|
|
486 | # |
|
|
487 | # egetent(database, key) |
|
|
488 | egetent() { |
|
|
489 | if [ "${ARCH}" == "macos" ] ; then |
|
|
490 | case "$2" in |
|
|
491 | *[!0-9]*) # Non numeric |
|
|
492 | nidump $1 . | awk -F":" "{ if (\$1 ~ /^$2$/) {print \$0;exit;} }" |
|
|
493 | ;; |
|
|
494 | *) # Numeric |
|
|
495 | nidump $1 . | awk -F":" "{ if (\$3 == $2) {print \$0;exit;} }" |
|
|
496 | ;; |
|
|
497 | esac |
|
|
498 | else |
|
|
499 | getent $1 $2 |
|
|
500 | fi |
|
|
501 | } |
|
|
502 | |
| 400 | # Simplify/standardize adding users to the system |
503 | # Simplify/standardize adding users to the system |
| 401 | # vapier@gentoo.org |
504 | # vapier@gentoo.org |
| 402 | # |
505 | # |
| 403 | # enewuser(username, uid, shell, homedir, groups, extra options) |
506 | # enewuser(username, uid, shell, homedir, groups, extra options) |
| 404 | # |
507 | # |
| 405 | # Default values if you do not specify any: |
508 | # Default values if you do not specify any: |
| 406 | # username: REQUIRED ! |
509 | # username: REQUIRED ! |
| 407 | # uid: next available (see useradd(8)) |
510 | # uid: next available (see useradd(8)) |
|
|
511 | # note: pass -1 to get default behavior |
| 408 | # shell: /bin/false |
512 | # shell: /bin/false |
| 409 | # homedir: /dev/null |
513 | # homedir: /dev/null |
| 410 | # groups: none |
514 | # groups: none |
| 411 | # extra: comment of 'added by portage for ${PN}' |
515 | # extra: comment of 'added by portage for ${PN}' |
| 412 | enewuser() { |
516 | enewuser() { |
| 413 | # get the username |
517 | # get the username |
| 414 | local euser="$1"; shift |
518 | local euser="$1"; shift |
| 415 | if [ -z "${euser}" ] ; then |
519 | if [ -z "${euser}" ] |
|
|
520 | then |
| 416 | eerror "No username specified !" |
521 | eerror "No username specified !" |
| 417 | die "Cannot call enewuser without a username" |
522 | die "Cannot call enewuser without a username" |
| 418 | fi |
523 | fi |
|
|
524 | |
|
|
525 | # lets see if the username already exists |
|
|
526 | if [ "${euser}" == "`egetent passwd \"${euser}\" | cut -d: -f1`" ] |
|
|
527 | then |
|
|
528 | return 0 |
|
|
529 | fi |
| 419 | einfo "Adding user '${euser}' to your system ..." |
530 | einfo "Adding user '${euser}' to your system ..." |
| 420 | |
531 | |
| 421 | # setup a file for testing usernames/groups |
|
|
| 422 | local tmpfile="`mktemp -p ${T}`" |
|
|
| 423 | touch ${tmpfile} |
|
|
| 424 | chown ${euser} ${tmpfile} >& /dev/null |
|
|
| 425 | local realuser="`ls -l ${tmpfile} | awk '{print $3}'`" |
|
|
| 426 | |
|
|
| 427 | # see if user already exists |
|
|
| 428 | if [ "${euser}" == "${realuser}" ] ; then |
|
|
| 429 | einfo "${euser} already exists on your system :)" |
|
|
| 430 | return 0 |
|
|
| 431 | fi |
|
|
| 432 | |
|
|
| 433 | # options to pass to useradd |
532 | # options to pass to useradd |
| 434 | local opts="" |
533 | local opts= |
| 435 | |
534 | |
| 436 | # handle uid |
535 | # handle uid |
| 437 | local euid="$1"; shift |
536 | local euid="$1"; shift |
| 438 | if [ ! -z "${euid}" ] ; then |
537 | if [ ! -z "${euid}" ] && [ "${euid}" != "-1" ] |
|
|
538 | then |
| 439 | if [ ${euid} -gt 0 ] ; then |
539 | if [ "${euid}" -gt 0 ] |
| 440 | opts="${opts} -u ${euid}" |
540 | then |
|
|
541 | if [ ! -z "`egetent passwd ${euid}`" ] |
|
|
542 | then |
|
|
543 | euid="next" |
|
|
544 | fi |
| 441 | else |
545 | else |
| 442 | eerror "Userid given but is not greater than 0 !" |
546 | eerror "Userid given but is not greater than 0 !" |
| 443 | die "${euid} is not a valid UID" |
547 | die "${euid} is not a valid UID" |
| 444 | fi |
548 | fi |
| 445 | else |
549 | else |
| 446 | euid="next available" |
550 | euid="next" |
|
|
551 | fi |
|
|
552 | if [ "${euid}" == "next" ] |
|
|
553 | then |
|
|
554 | local pwrange |
|
|
555 | if [ "${ARCH}" == "macos" ] ; then |
|
|
556 | pwrange="`jot 898 101`" |
|
|
557 | else |
|
|
558 | pwrange="`seq 101 999`" |
| 447 | fi |
559 | fi |
|
|
560 | for euid in ${pwrange} ; do |
|
|
561 | [ -z "`egetent passwd ${euid}`" ] && break |
|
|
562 | done |
|
|
563 | fi |
|
|
564 | opts="${opts} -u ${euid}" |
| 448 | einfo " - Userid: ${euid}" |
565 | einfo " - Userid: ${euid}" |
| 449 | |
566 | |
| 450 | # handle shell |
567 | # handle shell |
| 451 | local eshell="$1"; shift |
568 | local eshell="$1"; shift |
| 452 | if [ ! -z "${eshell}" ] ; then |
569 | if [ ! -z "${eshell}" ] && [ "${eshell}" != "-1" ] |
|
|
570 | then |
| 453 | if [ ! -e ${eshell} ] ; then |
571 | if [ ! -e "${eshell}" ] |
|
|
572 | then |
| 454 | eerror "A shell was specified but it does not exist !" |
573 | eerror "A shell was specified but it does not exist !" |
| 455 | die "${eshell} does not exist" |
574 | die "${eshell} does not exist" |
| 456 | fi |
575 | fi |
| 457 | else |
576 | else |
| 458 | eshell=/bin/false |
577 | eshell="/bin/false" |
| 459 | fi |
578 | fi |
| 460 | einfo " - Shell: ${eshell}" |
579 | einfo " - Shell: ${eshell}" |
| 461 | opts="${opts} -s ${eshell}" |
580 | opts="${opts} -s ${eshell}" |
| 462 | |
581 | |
| 463 | # handle homedir |
582 | # handle homedir |
| 464 | local ehome="$1"; shift |
583 | local ehome="$1"; shift |
| 465 | if [ -z "${ehome}" ] ; then |
584 | if [ -z "${ehome}" ] && [ "${eshell}" != "-1" ] |
|
|
585 | then |
| 466 | ehome=/dev/null |
586 | ehome="/dev/null" |
| 467 | fi |
587 | fi |
| 468 | einfo " - Home: ${ehome}" |
588 | einfo " - Home: ${ehome}" |
| 469 | opts="${opts} -d ${ehome}" |
589 | opts="${opts} -d ${ehome}" |
| 470 | |
590 | |
| 471 | # handle groups |
591 | # handle groups |
| 472 | local egroups="$1"; shift |
592 | local egroups="$1"; shift |
| 473 | if [ ! -z "${egroups}" ] ; then |
593 | if [ ! -z "${egroups}" ] |
| 474 | local realgroup |
594 | then |
| 475 | local oldifs="${IFS}" |
595 | local oldifs="${IFS}" |
| 476 | export IFS="," |
596 | export IFS="," |
| 477 | for g in ${egroups} ; do |
597 | for g in ${egroups} |
| 478 | chgrp ${g} ${tmpfile} >& /dev/null |
598 | do |
| 479 | realgroup="`ls -l ${tmpfile} | awk '{print $4}'`" |
599 | if [ -z "`egetent group \"${g}\"`" ] |
| 480 | if [ "${g}" != "${realgroup}" ] ; then |
600 | then |
| 481 | eerror "You must add ${g} to the system first" |
601 | eerror "You must add group ${g} to the system first" |
| 482 | die "${g} is not a valid GID" |
602 | die "${g} is not a valid GID" |
| 483 | fi |
603 | fi |
| 484 | done |
604 | done |
| 485 | export IFS="${oldifs}" |
605 | export IFS="${oldifs}" |
| 486 | opts="${opts} -g ${egroups}" |
606 | opts="${opts} -g ${egroups}" |
| … | |
… | |
| 489 | fi |
609 | fi |
| 490 | einfo " - Groups: ${egroups}" |
610 | einfo " - Groups: ${egroups}" |
| 491 | |
611 | |
| 492 | # handle extra and add the user |
612 | # handle extra and add the user |
| 493 | local eextra="$@" |
613 | local eextra="$@" |
| 494 | local oldsandbox="${oldsandbox}" |
614 | local oldsandbox="${SANDBOX_ON}" |
| 495 | export SANDBOX_ON="0" |
615 | export SANDBOX_ON="0" |
|
|
616 | if [ "${ARCH}" == "macos" ]; |
|
|
617 | then |
|
|
618 | ### Make the user |
| 496 | if [ -z "${eextra}" ] ; then |
619 | if [ -z "${eextra}" ] |
|
|
620 | then |
|
|
621 | dscl . create /users/${euser} uid ${euid} |
|
|
622 | dscl . create /users/${euser} shell ${eshell} |
|
|
623 | dscl . create /users/${euser} home ${ehome} |
|
|
624 | dscl . create /users/${euser} realname "added by portage for ${PN}" |
|
|
625 | ### Add the user to the groups specified |
|
|
626 | for g in ${egroups} |
|
|
627 | do |
|
|
628 | dscl . merge /groups/${g} users ${euser} |
|
|
629 | done |
|
|
630 | else |
|
|
631 | einfo "Extra options are not supported on macos yet" |
|
|
632 | einfo "Please report the ebuild along with the info below" |
|
|
633 | einfo "eextra: ${eextra}" |
|
|
634 | die "Required function missing" |
|
|
635 | fi |
|
|
636 | else |
|
|
637 | if [ -z "${eextra}" ] |
|
|
638 | then |
| 497 | useradd ${opts} ${euser} \ |
639 | useradd ${opts} ${euser} \ |
| 498 | -c "added by portage for ${PN}" \ |
640 | -c "added by portage for ${PN}" \ |
| 499 | || die "enewuser failed" |
641 | || die "enewuser failed" |
| 500 | else |
642 | else |
| 501 | einfo " - Extra: ${eextra}" |
643 | einfo " - Extra: ${eextra}" |
| 502 | useradd ${opts} ${euser} ${eextra} \ |
644 | useradd ${opts} ${euser} ${eextra} \ |
| 503 | || die "enewuser failed" |
645 | || die "enewuser failed" |
|
|
646 | fi |
| 504 | fi |
647 | fi |
| 505 | export SANDBOX_ON="${oldsandbox}" |
648 | export SANDBOX_ON="${oldsandbox}" |
| 506 | |
649 | |
| 507 | if [ ! -e ${ehome} ] && [ ! -e ${D}/${ehome} ] ; then |
650 | if [ ! -e "${ehome}" ] && [ ! -e "${D}/${ehome}" ] |
|
|
651 | then |
| 508 | einfo " - Creating ${ehome} in ${D}" |
652 | einfo " - Creating ${ehome} in ${D}" |
| 509 | dodir ${ehome} |
653 | dodir ${ehome} |
| 510 | fperms ${euser} ${ehome} |
654 | fowners ${euser} ${ehome} |
|
|
655 | fperms 755 ${ehome} |
| 511 | fi |
656 | fi |
| 512 | } |
657 | } |
| 513 | |
658 | |
| 514 | # Simplify/standardize adding groups to the system |
659 | # Simplify/standardize adding groups to the system |
| 515 | # vapier@gentoo.org |
660 | # vapier@gentoo.org |
| … | |
… | |
| 521 | # gid: next available (see groupadd(8)) |
666 | # gid: next available (see groupadd(8)) |
| 522 | # extra: none |
667 | # extra: none |
| 523 | enewgroup() { |
668 | enewgroup() { |
| 524 | # get the group |
669 | # get the group |
| 525 | local egroup="$1"; shift |
670 | local egroup="$1"; shift |
| 526 | if [ -z "${egroup}" ] ; then |
671 | if [ -z "${egroup}" ] |
|
|
672 | then |
| 527 | eerror "No group specified !" |
673 | eerror "No group specified !" |
| 528 | die "Cannot call enewgroup without a group" |
674 | die "Cannot call enewgroup without a group" |
| 529 | fi |
675 | fi |
|
|
676 | |
|
|
677 | # see if group already exists |
|
|
678 | if [ "${egroup}" == "`egetent group \"${egroup}\" | cut -d: -f1`" ] |
|
|
679 | then |
|
|
680 | return 0 |
|
|
681 | fi |
| 530 | einfo "Adding group '${egroup}' to your system ..." |
682 | einfo "Adding group '${egroup}' to your system ..." |
| 531 | |
683 | |
| 532 | # setup a file for testing groupname |
|
|
| 533 | local tmpfile="`mktemp -p ${T}`" |
|
|
| 534 | touch ${tmpfile} |
|
|
| 535 | chgrp ${egroup} ${tmpfile} >& /dev/null |
|
|
| 536 | local realgroup="`ls -l ${tmpfile} | awk '{print $4}'`" |
|
|
| 537 | |
|
|
| 538 | # see if group already exists |
|
|
| 539 | if [ "${egroup}" == "${realgroup}" ] ; then |
|
|
| 540 | einfo "${egroup} already exists on your system :)" |
|
|
| 541 | return 0 |
|
|
| 542 | fi |
|
|
| 543 | |
|
|
| 544 | # options to pass to useradd |
684 | # options to pass to useradd |
| 545 | local opts="" |
685 | local opts= |
| 546 | |
686 | |
| 547 | # handle gid |
687 | # handle gid |
| 548 | local egid="$1"; shift |
688 | local egid="$1"; shift |
| 549 | if [ ! -z "${egid}" ] ; then |
689 | if [ ! -z "${egid}" ] |
|
|
690 | then |
| 550 | if [ ${egid} -gt 0 ] ; then |
691 | if [ "${egid}" -gt 0 ] |
|
|
692 | then |
|
|
693 | if [ -z "`egetent group ${egid}`" ] |
|
|
694 | then |
|
|
695 | if [ "${ARCH}" == "macos" ] ; then |
|
|
696 | opts="${opts} ${egid}" |
|
|
697 | else |
| 551 | opts="${opts} -g ${egid}" |
698 | opts="${opts} -g ${egid}" |
|
|
699 | fi |
|
|
700 | else |
|
|
701 | egid="next available; requested gid taken" |
|
|
702 | fi |
| 552 | else |
703 | else |
| 553 | eerror "Groupid given but is not greater than 0 !" |
704 | eerror "Groupid given but is not greater than 0 !" |
| 554 | die "${egid} is not a valid GID" |
705 | die "${egid} is not a valid GID" |
| 555 | fi |
706 | fi |
| 556 | else |
707 | else |
| … | |
… | |
| 561 | # handle extra |
712 | # handle extra |
| 562 | local eextra="$@" |
713 | local eextra="$@" |
| 563 | opts="${opts} ${eextra}" |
714 | opts="${opts} ${eextra}" |
| 564 | |
715 | |
| 565 | # add the group |
716 | # add the group |
| 566 | local oldsandbox="${oldsandbox}" |
717 | local oldsandbox="${SANDBOX_ON}" |
| 567 | export SANDBOX_ON="0" |
718 | export SANDBOX_ON="0" |
|
|
719 | if [ "${ARCH}" == "macos" ]; |
|
|
720 | then |
|
|
721 | if [ ! -z "${eextra}" ]; |
|
|
722 | then |
|
|
723 | einfo "Extra options are not supported on macos yet" |
|
|
724 | einfo "Please report the ebuild along with the info below" |
|
|
725 | einfo "eextra: ${eextra}" |
|
|
726 | die "Required function missing" |
|
|
727 | fi |
|
|
728 | |
|
|
729 | # If we need the next available |
|
|
730 | case ${egid} in |
|
|
731 | *[!0-9]*) # Non numeric |
|
|
732 | for egid in `jot 898 101`; do |
|
|
733 | [ -z "`egetent group ${egid}`" ] && break |
|
|
734 | done |
|
|
735 | esac |
|
|
736 | dscl . create /groups/${egroup} gid ${egid} |
|
|
737 | dscl . create /groups/${egroup} passwd '*' |
|
|
738 | else |
| 568 | groupadd ${opts} ${egroup} || die "enewgroup failed" |
739 | groupadd ${opts} ${egroup} || die "enewgroup failed" |
|
|
740 | fi |
| 569 | export SANDBOX_ON="${oldsandbox}" |
741 | export SANDBOX_ON="${oldsandbox}" |
| 570 | } |
742 | } |
| 571 | |
743 | |
| 572 | # Simple script to replace 'dos2unix' binaries |
744 | # Simple script to replace 'dos2unix' binaries |
| 573 | # vapier@gentoo.org |
745 | # vapier@gentoo.org |
| 574 | # |
746 | # |
| 575 | # edos2unix(file, <more files>...) |
747 | # edos2unix(file, <more files>...) |
| 576 | edos2unix() { |
748 | edos2unix() { |
| 577 | for f in $@ ; do |
749 | for f in "$@" |
| 578 | cp ${f} ${T}/ |
750 | do |
| 579 | sed 's/\r$//' ${T}/${f} > ${f} |
751 | cp "${f}" ${T}/edos2unix |
|
|
752 | sed 's/\r$//' ${T}/edos2unix > "${f}" |
| 580 | done |
753 | done |
| 581 | } |
754 | } |
|
|
755 | |
|
|
756 | # Make a desktop file ! |
|
|
757 | # Great for making those icons in kde/gnome startmenu ! |
|
|
758 | # Amaze your friends ! Get the women ! Join today ! |
|
|
759 | # gnome2 /usr/share/applications |
|
|
760 | # gnome1 /usr/share/gnome/apps/ |
|
|
761 | # KDE ${KDEDIR}/share/applnk /usr/share/applnk |
|
|
762 | # |
|
|
763 | # make_desktop_entry(<binary>, [name], [icon], [type], [path]) |
|
|
764 | # |
|
|
765 | # binary: what binary does the app run with ? |
|
|
766 | # name: the name that will show up in the menu |
|
|
767 | # icon: give your little like a pretty little icon ... |
|
|
768 | # this can be relative (to /usr/share/pixmaps) or |
|
|
769 | # a full path to an icon |
|
|
770 | # type: what kind of application is this ? for categories: |
|
|
771 | # http://www.freedesktop.org/standards/menu-spec/ |
|
|
772 | # path: if your app needs to startup in a specific dir |
|
|
773 | make_desktop_entry() { |
|
|
774 | [ -z "$1" ] && eerror "You must specify the executable" && return 1 |
|
|
775 | |
|
|
776 | local exec="${1}" |
|
|
777 | local name="${2:-${PN}}" |
|
|
778 | local icon="${3:-${PN}.png}" |
|
|
779 | local type="${4}" |
|
|
780 | local subdir="${6}" |
|
|
781 | local path="${5:-${GAMES_PREFIX}}" |
|
|
782 | if [ -z "${type}" ] |
|
|
783 | then |
|
|
784 | case ${CATEGORY} in |
|
|
785 | "app-emulation") |
|
|
786 | type=Emulator |
|
|
787 | subdir="Emulation" |
|
|
788 | ;; |
|
|
789 | "games-"*) |
|
|
790 | type=Game |
|
|
791 | subdir="Games" |
|
|
792 | ;; |
|
|
793 | "net-"*) |
|
|
794 | type=Network |
|
|
795 | subdir="${type}" |
|
|
796 | ;; |
|
|
797 | *) |
|
|
798 | type= |
|
|
799 | subdir= |
|
|
800 | ;; |
|
|
801 | esac |
|
|
802 | fi |
|
|
803 | local desktop="${T}/${exec}.desktop" |
|
|
804 | |
|
|
805 | echo "[Desktop Entry] |
|
|
806 | Encoding=UTF-8 |
|
|
807 | Version=0.9.2 |
|
|
808 | Name=${name} |
|
|
809 | Type=Application |
|
|
810 | Comment=${DESCRIPTION} |
|
|
811 | Exec=${exec} |
|
|
812 | Path=${path} |
|
|
813 | Icon=${icon} |
|
|
814 | Categories=Application;${type};" > ${desktop} |
|
|
815 | |
|
|
816 | if [ -d "/usr/share/applications" ] |
|
|
817 | then |
|
|
818 | insinto /usr/share/applications |
|
|
819 | doins ${desktop} |
|
|
820 | fi |
|
|
821 | |
|
|
822 | #if [ -d "/usr/share/gnome/apps" ] |
|
|
823 | #then |
|
|
824 | # insinto /usr/share/gnome/apps/Games |
|
|
825 | # doins ${desktop} |
|
|
826 | #fi |
|
|
827 | |
|
|
828 | #if [ ! -z "`ls /usr/kde/* 2>/dev/null`" ] |
|
|
829 | #then |
|
|
830 | # for ver in /usr/kde/* |
|
|
831 | # do |
|
|
832 | # insinto ${ver}/share/applnk/Games |
|
|
833 | # doins ${desktop} |
|
|
834 | # done |
|
|
835 | #fi |
|
|
836 | |
|
|
837 | if [ -d "/usr/share/applnk" ] |
|
|
838 | then |
|
|
839 | insinto /usr/share/applnk/${subdir} |
|
|
840 | doins ${desktop} |
|
|
841 | fi |
|
|
842 | |
|
|
843 | return 0 |
|
|
844 | } |
|
|
845 | |
|
|
846 | # for internal use only (unpack_pdv and unpack_makeself) |
|
|
847 | find_unpackable_file() { |
|
|
848 | local src="$1" |
|
|
849 | if [ -z "${src}" ] |
|
|
850 | then |
|
|
851 | src="${DISTDIR}/${A}" |
|
|
852 | else |
|
|
853 | if [ -e "${DISTDIR}/${src}" ] |
|
|
854 | then |
|
|
855 | src="${DISTDIR}/${src}" |
|
|
856 | elif [ -e "${PWD}/${src}" ] |
|
|
857 | then |
|
|
858 | src="${PWD}/${src}" |
|
|
859 | elif [ -e "${src}" ] |
|
|
860 | then |
|
|
861 | src="${src}" |
|
|
862 | fi |
|
|
863 | fi |
|
|
864 | [ ! -e "${src}" ] && die "Could not find requested archive ${src}" |
|
|
865 | echo "${src}" |
|
|
866 | } |
|
|
867 | |
|
|
868 | # Unpack those pesky pdv generated files ... |
|
|
869 | # They're self-unpacking programs with the binary package stuffed in |
|
|
870 | # the middle of the archive. Valve seems to use it a lot ... too bad |
|
|
871 | # it seems to like to segfault a lot :(. So lets take it apart ourselves. |
|
|
872 | # |
|
|
873 | # Usage: unpack_pdv [file to unpack] [size of off_t] |
|
|
874 | # - you have to specify the off_t size ... i have no idea how to extract that |
|
|
875 | # information out of the binary executable myself. basically you pass in |
|
|
876 | # the size of the off_t type (in bytes) on the machine that built the pdv |
|
|
877 | # archive. one way to determine this is by running the following commands: |
|
|
878 | # strings <pdv archive> | grep lseek |
|
|
879 | # strace -elseek <pdv archive> |
|
|
880 | # basically look for the first lseek command (we do the strings/grep because |
|
|
881 | # sometimes the function call is _llseek or something) and steal the 2nd |
|
|
882 | # parameter. here is an example: |
|
|
883 | # root@vapier 0 pdv_unpack # strings hldsupdatetool.bin | grep lseek |
|
|
884 | # lseek |
|
|
885 | # root@vapier 0 pdv_unpack # strace -elseek ./hldsupdatetool.bin |
|
|
886 | # lseek(3, -4, SEEK_END) = 2981250 |
|
|
887 | # thus we would pass in the value of '4' as the second parameter. |
|
|
888 | unpack_pdv() { |
|
|
889 | local src="`find_unpackable_file $1`" |
|
|
890 | local sizeoff_t="$2" |
|
|
891 | |
|
|
892 | [ -z "${sizeoff_t}" ] && die "No idea what off_t size was used for this pdv :(" |
|
|
893 | |
|
|
894 | local shrtsrc="`basename ${src}`" |
|
|
895 | echo ">>> Unpacking ${shrtsrc} to ${PWD}" |
|
|
896 | local metaskip=`tail -c ${sizeoff_t} ${src} | hexdump -e \"%i\"` |
|
|
897 | local tailskip=`tail -c $((${sizeoff_t}*2)) ${src} | head -c ${sizeoff_t} | hexdump -e \"%i\"` |
|
|
898 | |
|
|
899 | # grab metadata for debug reasons |
|
|
900 | local metafile="`mymktemp ${T}`" |
|
|
901 | tail -c +$((${metaskip}+1)) ${src} > ${metafile} |
|
|
902 | |
|
|
903 | # rip out the final file name from the metadata |
|
|
904 | local datafile="`tail -c +$((${metaskip}+1)) ${src} | strings | head -n 1`" |
|
|
905 | datafile="`basename ${datafile}`" |
|
|
906 | |
|
|
907 | # now lets uncompress/untar the file if need be |
|
|
908 | local tmpfile="`mymktemp ${T}`" |
|
|
909 | tail -c +$((${tailskip}+1)) ${src} 2>/dev/null | head -c 512 > ${tmpfile} |
|
|
910 | |
|
|
911 | local iscompressed="`file -b ${tmpfile}`" |
|
|
912 | if [ "${iscompressed:0:8}" == "compress" ] ; then |
|
|
913 | iscompressed=1 |
|
|
914 | mv ${tmpfile}{,.Z} |
|
|
915 | gunzip ${tmpfile} |
|
|
916 | else |
|
|
917 | iscompressed=0 |
|
|
918 | fi |
|
|
919 | local istar="`file -b ${tmpfile}`" |
|
|
920 | if [ "${istar:0:9}" == "POSIX tar" ] ; then |
|
|
921 | istar=1 |
|
|
922 | else |
|
|
923 | istar=0 |
|
|
924 | fi |
|
|
925 | |
|
|
926 | #for some reason gzip dies with this ... dd cant provide buffer fast enough ? |
|
|
927 | #dd if=${src} ibs=${metaskip} count=1 \ |
|
|
928 | # | dd ibs=${tailskip} skip=1 \ |
|
|
929 | # | gzip -dc \ |
|
|
930 | # > ${datafile} |
|
|
931 | if [ ${iscompressed} -eq 1 ] ; then |
|
|
932 | if [ ${istar} -eq 1 ] ; then |
|
|
933 | tail -c +$((${tailskip}+1)) ${src} 2>/dev/null \ |
|
|
934 | | head -c $((${metaskip}-${tailskip})) \ |
|
|
935 | | tar -xzf - |
|
|
936 | else |
|
|
937 | tail -c +$((${tailskip}+1)) ${src} 2>/dev/null \ |
|
|
938 | | head -c $((${metaskip}-${tailskip})) \ |
|
|
939 | | gzip -dc \ |
|
|
940 | > ${datafile} |
|
|
941 | fi |
|
|
942 | else |
|
|
943 | if [ ${istar} -eq 1 ] ; then |
|
|
944 | tail -c +$((${tailskip}+1)) ${src} 2>/dev/null \ |
|
|
945 | | head -c $((${metaskip}-${tailskip})) \ |
|
|
946 | | tar --no-same-owner -xf - |
|
|
947 | else |
|
|
948 | tail -c +$((${tailskip}+1)) ${src} 2>/dev/null \ |
|
|
949 | | head -c $((${metaskip}-${tailskip})) \ |
|
|
950 | > ${datafile} |
|
|
951 | fi |
|
|
952 | fi |
|
|
953 | true |
|
|
954 | #[ -s "${datafile}" ] || die "failure unpacking pdv ('${metaskip}' '${tailskip}' '${datafile}')" |
|
|
955 | #assert "failure unpacking pdv ('${metaskip}' '${tailskip}' '${datafile}')" |
|
|
956 | } |
|
|
957 | |
|
|
958 | # Unpack those pesky makeself generated files ... |
|
|
959 | # They're shell scripts with the binary package tagged onto |
|
|
960 | # the end of the archive. Loki utilized the format as does |
|
|
961 | # many other game companies. |
|
|
962 | # |
|
|
963 | # Usage: unpack_makeself [file to unpack] [offset] |
|
|
964 | # - If the file is not specified then unpack will utilize ${A}. |
|
|
965 | # - If the offset is not specified then we will attempt to extract |
|
|
966 | # the proper offset from the script itself. |
|
|
967 | unpack_makeself() { |
|
|
968 | local src="`find_unpackable_file $1`" |
|
|
969 | local skip="$2" |
|
|
970 | |
|
|
971 | local shrtsrc="`basename ${src}`" |
|
|
972 | echo ">>> Unpacking ${shrtsrc} to ${PWD}" |
|
|
973 | if [ -z "${skip}" ] |
|
|
974 | then |
|
|
975 | local ver="`grep -a '#.*Makeself' ${src} | awk '{print $NF}'`" |
|
|
976 | local skip=0 |
|
|
977 | case ${ver} in |
|
|
978 | 1.5.*) # tested 1.5.{3,4,5} ... guessing 1.5.x series is same |
|
|
979 | skip=`grep -a ^skip= ${src} | cut -d= -f2` |
|
|
980 | ;; |
|
|
981 | 2.0|2.0.1) |
|
|
982 | skip=`grep -a ^$'\t'tail ${src} | awk '{print $2}' | cut -b2-` |
|
|
983 | ;; |
|
|
984 | 2.1.1) |
|
|
985 | skip=`grep -a ^offset= ${src} | awk '{print $2}' | cut -b2-` |
|
|
986 | let skip="skip + 1" |
|
|
987 | ;; |
|
|
988 | 2.1.2) |
|
|
989 | skip=`grep -a ^offset= ${src} | awk '{print $3}' | head -n 1` |
|
|
990 | let skip="skip + 1" |
|
|
991 | ;; |
|
|
992 | 2.1.3) |
|
|
993 | skip=`grep -a ^offset= ${src} | awk '{print $3}'` |
|
|
994 | let skip="skip + 1" |
|
|
995 | ;; |
|
|
996 | *) |
|
|
997 | eerror "I'm sorry, but I was unable to support the Makeself file." |
|
|
998 | eerror "The version I detected was '${ver}'." |
|
|
999 | eerror "Please file a bug about the file ${shrtsrc} at" |
|
|
1000 | eerror "http://bugs.gentoo.org/ so that support can be added." |
|
|
1001 | die "makeself version '${ver}' not supported" |
|
|
1002 | ;; |
|
|
1003 | esac |
|
|
1004 | debug-print "Detected Makeself version ${ver} ... using ${skip} as offset" |
|
|
1005 | fi |
|
|
1006 | |
|
|
1007 | # lets grab the first few bytes of the file to figure out what kind of archive it is |
|
|
1008 | local tmpfile="`mymktemp ${T}`" |
|
|
1009 | tail -n +${skip} ${src} 2>/dev/null | head -c 512 > ${tmpfile} |
|
|
1010 | local filetype="`file -b ${tmpfile}`" |
|
|
1011 | case ${filetype} in |
|
|
1012 | *tar\ archive) |
|
|
1013 | tail -n +${skip} ${src} | tar --no-same-owner -xf - |
|
|
1014 | ;; |
|
|
1015 | bzip2*) |
|
|
1016 | tail -n +${skip} ${src} | bzip2 -dc | tar --no-same-owner -xf - |
|
|
1017 | ;; |
|
|
1018 | gzip*) |
|
|
1019 | tail -n +${skip} ${src} | tar --no-same-owner -xzf - |
|
|
1020 | ;; |
|
|
1021 | *) |
|
|
1022 | false |
|
|
1023 | ;; |
|
|
1024 | esac |
|
|
1025 | assert "failure unpacking (${filetype}) makeself ${shrtsrc} ('${ver}' +${skip})" |
|
|
1026 | } |
|
|
1027 | |
|
|
1028 | # Display a license for user to accept. |
|
|
1029 | # |
|
|
1030 | # Usage: check_license [license] |
|
|
1031 | # - If the file is not specified then ${LICENSE} is used. |
|
|
1032 | check_license() { |
|
|
1033 | local lic=$1 |
|
|
1034 | if [ -z "${lic}" ] ; then |
|
|
1035 | lic="${PORTDIR}/licenses/${LICENSE}" |
|
|
1036 | else |
|
|
1037 | if [ -e "${PORTDIR}/licenses/${src}" ] ; then |
|
|
1038 | lic="${PORTDIR}/licenses/${src}" |
|
|
1039 | elif [ -e "${PWD}/${src}" ] ; then |
|
|
1040 | lic="${PWD}/${src}" |
|
|
1041 | elif [ -e "${src}" ] ; then |
|
|
1042 | lic="${src}" |
|
|
1043 | fi |
|
|
1044 | fi |
|
|
1045 | [ ! -f "${lic}" ] && die "Could not find requested license ${src}" |
|
|
1046 | local l="`basename ${lic}`" |
|
|
1047 | |
|
|
1048 | # here is where we check for the licenses the user already |
|
|
1049 | # accepted ... if we don't find a match, we make the user accept |
|
|
1050 | local alic |
|
|
1051 | for alic in "${ACCEPT_LICENSE}" ; do |
|
|
1052 | [ "${alic}" == "*" ] && return 0 |
|
|
1053 | [ "${alic}" == "${l}" ] && return 0 |
|
|
1054 | done |
|
|
1055 | |
|
|
1056 | local licmsg="`mymktemp ${T}`" |
|
|
1057 | cat << EOF > ${licmsg} |
|
|
1058 | ********************************************************** |
|
|
1059 | The following license outlines the terms of use of this |
|
|
1060 | package. You MUST accept this license for installation to |
|
|
1061 | continue. When you are done viewing, hit 'q'. If you |
|
|
1062 | CTRL+C out of this, the install will not run! |
|
|
1063 | ********************************************************** |
|
|
1064 | |
|
|
1065 | EOF |
|
|
1066 | cat ${lic} >> ${licmsg} |
|
|
1067 | ${PAGER:-less} ${licmsg} || die "Could not execute pager (${PAGER}) to accept ${lic}" |
|
|
1068 | einfon "Do you accept the terms of this license (${l})? [yes/no] " |
|
|
1069 | read alic |
|
|
1070 | case ${alic} in |
|
|
1071 | yes|Yes|y|Y) |
|
|
1072 | return 0 |
|
|
1073 | ;; |
|
|
1074 | *) |
|
|
1075 | echo;echo;echo |
|
|
1076 | eerror "You MUST accept the license to continue! Exiting!" |
|
|
1077 | die "Failed to accept license" |
|
|
1078 | ;; |
|
|
1079 | esac |
|
|
1080 | } |
|
|
1081 | |
|
|
1082 | # Aquire cd(s) for those lovely cd-based emerges. Yes, this violates |
|
|
1083 | # the whole 'non-interactive' policy, but damnit I want CD support ! |
|
|
1084 | # |
|
|
1085 | # with these cdrom functions we handle all the user interaction and |
|
|
1086 | # standardize everything. all you have to do is call cdrom_get_cds() |
|
|
1087 | # and when the function returns, you can assume that the cd has been |
|
|
1088 | # found at CDROM_ROOT. |
|
|
1089 | # |
|
|
1090 | # normally the cdrom functions will refer to the cds as 'cd #1', 'cd #2', |
|
|
1091 | # etc... if you want to give the cds better names, then just export |
|
|
1092 | # the CDROM_NAME_X variables before calling cdrom_get_cds(). |
|
|
1093 | # |
|
|
1094 | # for those multi cd ebuilds, see the cdrom_load_next_cd() below. |
|
|
1095 | # |
|
|
1096 | # Usage: cdrom_get_cds <file on cd1> [file on cd2] [file on cd3] [...] |
|
|
1097 | # - this will attempt to locate a cd based upon a file that is on |
|
|
1098 | # the cd ... the more files you give this function, the more cds |
|
|
1099 | # the cdrom functions will handle |
|
|
1100 | cdrom_get_cds() { |
|
|
1101 | # first we figure out how many cds we're dealing with by |
|
|
1102 | # the # of files they gave us |
|
|
1103 | local cdcnt=0 |
|
|
1104 | local f= |
|
|
1105 | for f in "$@" ; do |
|
|
1106 | cdcnt=$((cdcnt + 1)) |
|
|
1107 | export CDROM_CHECK_${cdcnt}="$f" |
|
|
1108 | done |
|
|
1109 | export CDROM_TOTAL_CDS=${cdcnt} |
|
|
1110 | export CDROM_CURRENT_CD=1 |
|
|
1111 | |
|
|
1112 | # now we see if the user gave use CD_ROOT ... |
|
|
1113 | # if they did, let's just believe them that it's correct |
|
|
1114 | if [ ! -z "${CD_ROOT}" ] ; then |
|
|
1115 | export CDROM_ROOT="${CD_ROOT}" |
|
|
1116 | einfo "Found CD #${CDROM_CURRENT_CD} root at ${CDROM_ROOT}" |
|
|
1117 | return |
|
|
1118 | fi |
|
|
1119 | # do the same for CD_ROOT_X |
|
|
1120 | if [ ! -z "${CD_ROOT_1}" ] ; then |
|
|
1121 | local var= |
|
|
1122 | cdcnt=0 |
|
|
1123 | while [ ${cdcnt} -lt ${CDROM_TOTAL_CDS} ] ; do |
|
|
1124 | cdcnt=$((cdcnt + 1)) |
|
|
1125 | var="CD_ROOT_${cdcnt}" |
|
|
1126 | if [ -z "${!var}" ] ; then |
|
|
1127 | eerror "You must either use just the CD_ROOT" |
|
|
1128 | eerror "or specify ALL the CD_ROOT_X variables." |
|
|
1129 | eerror "In this case, you will need ${CDROM_TOTAL_CDS} CD_ROOT_X variables." |
|
|
1130 | die "could not locate CD_ROOT_${cdcnt}" |
|
|
1131 | fi |
|
|
1132 | export CDROM_ROOTS_${cdcnt}="${!var}" |
|
|
1133 | done |
|
|
1134 | export CDROM_ROOT=${CDROM_ROOTS_1} |
|
|
1135 | einfo "Found CD #${CDROM_CURRENT_CD} root at ${CDROM_ROOT}" |
|
|
1136 | return |
|
|
1137 | fi |
|
|
1138 | |
|
|
1139 | if [ ${CDROM_TOTAL_CDS} -eq 1 ] ; then |
|
|
1140 | einfon "This ebuild will need the " |
|
|
1141 | if [ -z "${CDROM_NAME}" ] ; then |
|
|
1142 | echo "cdrom for ${PN}." |
|
|
1143 | else |
|
|
1144 | echo "${CDROM_NAME}." |
|
|
1145 | fi |
|
|
1146 | echo |
|
|
1147 | einfo "If you do not have the CD, but have the data files" |
|
|
1148 | einfo "mounted somewhere on your filesystem, just export" |
|
|
1149 | einfo "the variable CD_ROOT so that it points to the" |
|
|
1150 | einfo "directory containing the files." |
|
|
1151 | echo |
|
|
1152 | else |
|
|
1153 | einfo "This package will need access to ${CDROM_TOTAL_CDS} cds." |
|
|
1154 | cdcnt=0 |
|
|
1155 | while [ ${cdcnt} -lt ${CDROM_TOTAL_CDS} ] ; do |
|
|
1156 | cdcnt=$((cdcnt + 1)) |
|
|
1157 | var="CDROM_NAME_${cdcnt}" |
|
|
1158 | [ ! -z "${!var}" ] && einfo " CD ${cdcnt}: ${!var}" |
|
|
1159 | done |
|
|
1160 | echo |
|
|
1161 | einfo "If you do not have the CDs, but have the data files" |
|
|
1162 | einfo "mounted somewhere on your filesystem, just export" |
|
|
1163 | einfo "the following variables so they point to the right place:" |
|
|
1164 | einfon "" |
|
|
1165 | cdcnt=0 |
|
|
1166 | while [ ${cdcnt} -lt ${CDROM_TOTAL_CDS} ] ; do |
|
|
1167 | cdcnt=$((cdcnt + 1)) |
|
|
1168 | echo -n " CD_ROOT_${cdcnt}" |
|
|
1169 | done |
|
|
1170 | echo |
|
|
1171 | einfo "Or, if you have all the files in the same place, or" |
|
|
1172 | einfo "you only have one cdrom, you can export CD_ROOT" |
|
|
1173 | einfo "and that place will be used as the same data source" |
|
|
1174 | einfo "for all the CDs." |
|
|
1175 | echo |
|
|
1176 | fi |
|
|
1177 | export CDROM_CURRENT_CD=0 |
|
|
1178 | cdrom_load_next_cd |
|
|
1179 | } |
|
|
1180 | |
|
|
1181 | # this is only used when you need access to more than one cd. |
|
|
1182 | # when you have finished using the first cd, just call this function. |
|
|
1183 | # when it returns, CDROM_ROOT will be pointing to the second cd. |
|
|
1184 | # remember, you can only go forward in the cd chain, you can't go back. |
|
|
1185 | cdrom_load_next_cd() { |
|
|
1186 | export CDROM_CURRENT_CD=$((CDROM_CURRENT_CD + 1)) |
|
|
1187 | local var= |
|
|
1188 | |
|
|
1189 | if [ ! -z "${CD_ROOT}" ] ; then |
|
|
1190 | einfo "Using same root as before for CD #${CDROM_CURRENT_CD}" |
|
|
1191 | return |
|
|
1192 | fi |
|
|
1193 | |
|
|
1194 | unset CDROM_ROOT |
|
|
1195 | var=CDROM_ROOTS_${CDROM_CURRENT_CD} |
|
|
1196 | if [ -z "${!var}" ] ; then |
|
|
1197 | var="CDROM_CHECK_${CDROM_CURRENT_CD}" |
|
|
1198 | cdrom_locate_file_on_cd ${!var} |
|
|
1199 | else |
|
|
1200 | export CDROM_ROOT="${!var}" |
|
|
1201 | fi |
|
|
1202 | |
|
|
1203 | einfo "Found CD #${CDROM_CURRENT_CD} root at ${CDROM_ROOT}" |
|
|
1204 | } |
|
|
1205 | |
|
|
1206 | # this is used internally by the cdrom_get_cds() and cdrom_load_next_cd() |
|
|
1207 | # functions. this should *never* be called from an ebuild. |
|
|
1208 | # all it does is try to locate a give file on a cd ... if the cd isn't |
|
|
1209 | # found, then a message asking for the user to insert the cdrom will be |
|
|
1210 | # displayed and we'll hang out here until: |
|
|
1211 | # (1) the file is found on a mounted cdrom |
|
|
1212 | # (2) the user hits CTRL+C |
|
|
1213 | cdrom_locate_file_on_cd() { |
|
|
1214 | while [ -z "${CDROM_ROOT}" ] ; do |
|
|
1215 | local dir="$(dirname ${@})" |
|
|
1216 | local file="$(basename ${@})" |
|
|
1217 | local mline="" |
|
|
1218 | local showedmsg=0 |
|
|
1219 | |
|
|
1220 | for mline in `mount | egrep -e '(iso|cdrom)' | awk '{print $3}'` ; do |
|
|
1221 | [ -d "${mline}/${dir}" ] || continue |
|
|
1222 | [ ! -z "$(find ${mline}/${dir} -iname ${file} -maxdepth 1)" ] \ |
|
|
1223 | && export CDROM_ROOT=${mline} |
|
|
1224 | done |
|
|
1225 | |
|
|
1226 | if [ -z "${CDROM_ROOT}" ] ; then |
|
|
1227 | echo |
|
|
1228 | if [ ${showedmsg} -eq 0 ] ; then |
|
|
1229 | if [ ${CDROM_TOTAL_CDS} -eq 1 ] ; then |
|
|
1230 | if [ -z "${CDROM_NAME}" ] ; then |
|
|
1231 | einfo "Please insert the cdrom for ${PN} now !" |
|
|
1232 | else |
|
|
1233 | einfo "Please insert the ${CDROM_NAME} cdrom now !" |
|
|
1234 | fi |
|
|
1235 | else |
|
|
1236 | if [ -z "${CDROM_NAME_1}" ] ; then |
|
|
1237 | einfo "Please insert cd #${CDROM_CURRENT_CD} for ${PN} now !" |
|
|
1238 | else |
|
|
1239 | local var="CDROM_NAME_${CDROM_CURRENT_CD}" |
|
|
1240 | einfo "Please insert+mount the ${!var} cdrom now !" |
|
|
1241 | fi |
|
|
1242 | fi |
|
|
1243 | showedmsg=1 |
|
|
1244 | fi |
|
|
1245 | einfo "Press return to scan for the cd again" |
|
|
1246 | einfo "or hit CTRL+C to abort the emerge." |
|
|
1247 | read |
|
|
1248 | fi |
|
|
1249 | done |
|
|
1250 | } |
|
|
1251 | |
|
|
1252 | # Make sure that LINGUAS only contains languages that |
|
|
1253 | # a package can support |
|
|
1254 | # |
|
|
1255 | # usage: strip-linguas <allow LINGUAS> |
|
|
1256 | # strip-linguas -i <directories of .po files> |
|
|
1257 | # strip-linguas -u <directories of .po files> |
|
|
1258 | # |
|
|
1259 | # The first form allows you to specify a list of LINGUAS. |
|
|
1260 | # The -i builds a list of po files found in all the |
|
|
1261 | # directories and uses the intersection of the lists. |
|
|
1262 | # The -u builds a list of po files found in all the |
|
|
1263 | # directories and uses the union of the lists. |
|
|
1264 | strip-linguas() { |
|
|
1265 | local ls newls |
|
|
1266 | if [ "$1" == "-i" ] || [ "$1" == "-u" ] ; then |
|
|
1267 | local op="$1"; shift |
|
|
1268 | ls=" $(find "$1" -name '*.po' -printf '%f ') "; shift |
|
|
1269 | local d f |
|
|
1270 | for d in "$@" ; do |
|
|
1271 | if [ "${op}" == "-u" ] ; then |
|
|
1272 | newls="${ls}" |
|
|
1273 | else |
|
|
1274 | newls="" |
|
|
1275 | fi |
|
|
1276 | for f in $(find "$d" -name '*.po' -printf '%f ') ; do |
|
|
1277 | if [ "${op}" == "-i" ] ; then |
|
|
1278 | [ "${ls/ ${f} /}" != "${ls}" ] && newls="${newls} ${f}" |
|
|
1279 | else |
|
|
1280 | [ "${ls/ ${f} /}" == "${ls}" ] && newls="${newls} ${f}" |
|
|
1281 | fi |
|
|
1282 | done |
|
|
1283 | ls="${newls}" |
|
|
1284 | done |
|
|
1285 | ls="${ls//.po}" |
|
|
1286 | else |
|
|
1287 | ls="$@" |
|
|
1288 | fi |
|
|
1289 | |
|
|
1290 | ls=" ${ls} " |
|
|
1291 | newls="" |
|
|
1292 | for f in ${LINGUAS} ; do |
|
|
1293 | if [ "${ls/ ${f} /}" != "${ls}" ] ; then |
|
|
1294 | nl="${newls} ${f}" |
|
|
1295 | else |
|
|
1296 | ewarn "Sorry, but ${PN} does not support the ${f} LINGUA" |
|
|
1297 | fi |
|
|
1298 | done |
|
|
1299 | if [ -z "${newls}" ] ; then |
|
|
1300 | unset LINGUAS |
|
|
1301 | else |
|
|
1302 | export LINGUAS="${newls}" |
|
|
1303 | fi |
|
|
1304 | } |