Deleted Added
sdiff udiff text old ( 244675 ) new ( 251190 )
full compact
zones.subr (244675) zones.subr (251190)
1if [ ! "$_TIMEZONE_ZONES_SUBR" ]; then _TIMEZONE_ZONES_SUBR=1
2#
3# Copyright (c) 2011-2012 Devin Teske
4# All Rights Reserved.
5#
6# Redistribution and use in source and binary forms, with or without
7# modification, are permitted provided that the following conditions
8# are met:

--- 10 unchanged lines hidden (view full) ---

19# FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
20# DAMAGES (INLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
21# OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
22# HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
23# LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
24# OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
25# SUCH DAMAGE.
26#
1if [ ! "$_TIMEZONE_ZONES_SUBR" ]; then _TIMEZONE_ZONES_SUBR=1
2#
3# Copyright (c) 2011-2012 Devin Teske
4# All Rights Reserved.
5#
6# Redistribution and use in source and binary forms, with or without
7# modification, are permitted provided that the following conditions
8# are met:

--- 10 unchanged lines hidden (view full) ---

19# FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
20# DAMAGES (INLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
21# OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
22# HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
23# LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
24# OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
25# SUCH DAMAGE.
26#
27# $FreeBSD: head/usr.sbin/bsdconfig/timezone/share/zones.subr 244675 2012-12-25 10:47:45Z dteske $
27# $FreeBSD: head/usr.sbin/bsdconfig/timezone/share/zones.subr 251190 2013-05-31 19:07:17Z dteske $
28#
29############################################################ INCLUDES
30
31BSDCFG_SHARE="/usr/share/bsdconfig"
32. $BSDCFG_SHARE/common.subr || exit 1
33f_dprintf "%s: loading includes..." timezone/zones.subr
34f_include $BSDCFG_SHARE/dialog.subr
35f_include $BSDCFG_SHARE/timezone/continents.subr

--- 307 unchanged lines hidden (view full) ---

343
344# f_install_zoneinfo_file $filename
345#
346# Installs a zone file to _PATH_LOCALTIME.
347#
348f_install_zoneinfo_file()
349{
350 local zoneinfo_file="$1"
28#
29############################################################ INCLUDES
30
31BSDCFG_SHARE="/usr/share/bsdconfig"
32. $BSDCFG_SHARE/common.subr || exit 1
33f_dprintf "%s: loading includes..." timezone/zones.subr
34f_include $BSDCFG_SHARE/dialog.subr
35f_include $BSDCFG_SHARE/timezone/continents.subr

--- 307 unchanged lines hidden (view full) ---

343
344# f_install_zoneinfo_file $filename
345#
346# Installs a zone file to _PATH_LOCALTIME.
347#
348f_install_zoneinfo_file()
349{
350 local zoneinfo_file="$1"
351 local copymode title msg err size
351 local copymode title msg err height width
352
353 if [ -L "$_PATH_LOCALTIME" ]; then
354 copymode=
355 elif [ ! -e "$_PATH_LOCALTIME" ]; then
356 # Nothing there yet...
357 copymode=1
358 else
359 copymode=1

--- 9 unchanged lines hidden (view full) ---

369 msg=$( printf "$msg_creating_symlink" \
370 "$_PATH_LOCALTIME" "$zoneinfo_file" )
371 fi
372 if [ "$USEDIALOG" ]; then
373 f_dialog_title "$msg_info"
374 title="$DIALOG_TITLE"
375 btitle="$DIALOG_BACKTITLE"
376 f_dialog_title_restore
352
353 if [ -L "$_PATH_LOCALTIME" ]; then
354 copymode=
355 elif [ ! -e "$_PATH_LOCALTIME" ]; then
356 # Nothing there yet...
357 copymode=1
358 else
359 copymode=1

--- 9 unchanged lines hidden (view full) ---

369 msg=$( printf "$msg_creating_symlink" \
370 "$_PATH_LOCALTIME" "$zoneinfo_file" )
371 fi
372 if [ "$USEDIALOG" ]; then
373 f_dialog_title "$msg_info"
374 title="$DIALOG_TITLE"
375 btitle="$DIALOG_BACKTITLE"
376 f_dialog_title_restore
377 size=$( f_dialog_buttonbox_size "$title" \
378 "$btitle" "$msg" )
379 eval $DIALOG \
380 --title \"\$title\" \
381 --backtitle \"\$btitle\" \
382 --ok-label \"\$msg_ok\" \
383 --msgbox \"\$msg\" $size
377 f_dialog_buttonbox_size height width \
378 "$title" "$btitle" "$msg"
379 $DIALOG \
380 --title "$title" \
381 --backtitle "$btitle" \
382 --ok-label "$msg_ok" \
383 --msgbox "$msg" $height $width
384 else
385 printf "%s\n" "$msg"
386 fi
387 fi
388
389 if [ "$REALLYDOIT" ]; then
390 f_dialog_title "$msg_error"
391 title="$DIALOG_TITLE"
392 btitle="$DIALOG_BACKTITLE"
393 f_dialog_title_restore
394
395 if [ ! "$zoneinfo_file" ]; then
396
397 err=$( rm -f "$_PATH_LOCALTIME" 2>&1 )
398 if [ "$err" ]; then
399 if [ "$USEDIALOG" ]; then
384 else
385 printf "%s\n" "$msg"
386 fi
387 fi
388
389 if [ "$REALLYDOIT" ]; then
390 f_dialog_title "$msg_error"
391 title="$DIALOG_TITLE"
392 btitle="$DIALOG_BACKTITLE"
393 f_dialog_title_restore
394
395 if [ ! "$zoneinfo_file" ]; then
396
397 err=$( rm -f "$_PATH_LOCALTIME" 2>&1 )
398 if [ "$err" ]; then
399 if [ "$USEDIALOG" ]; then
400 size=$( f_dialog_buttonbox_size \
401 "$title" \
402 "$btitle" \
403 "$err" )
404 eval $DIALOG \
405 --title \"\$title\" \
406 --backtitle \"\$btitle\" \
407 --ok-label \"\$msg_ok\" \
408 --msgbox \"\$err\" $size
400 f_dialog_buttonbox_size height width \
401 "$title" \
402 "$btitle" \
403 "$err"
404 $DIALOG \
405 --title "$title" \
406 --backtitle "$btitle" \
407 --ok-label "$msg_ok" \
408 --msgbox "$err" $height $width
409 else
410 f_err "%s\n" "$err"
411 fi
412 return $FAILURE
413 fi
414
415 err=$( rm -f "$_PATH_DB" 2>&1 )
416 if [ "$err" ]; then
417 if [ "$USEDIALOG" ]; then
409 else
410 f_err "%s\n" "$err"
411 fi
412 return $FAILURE
413 fi
414
415 err=$( rm -f "$_PATH_DB" 2>&1 )
416 if [ "$err" ]; then
417 if [ "$USEDIALOG" ]; then
418 size=$( f_dialog_buttonbox_size \
419 "$title" \
420 "$btitle" \
421 "$err" )
422 eval $DIALOG \
423 --title \"\$title\" \
424 --backtitle \"\$btitle\" \
425 --ok-label \"\$msg_ok\" \
426 --msgbox \"\$err\" $size
418 f_dialog_buttonbox_size height width \
419 "$title" \
420 "$btitle" \
421 "$err"
422 $DIALOG \
423 --title "$title" \
424 --backtitle "$btitle" \
425 --ok-label "$msg_ok" \
426 --msgbox "$err" $height $width
427 else
428 f_err "%s\n" "$err"
429 fi
430 return $FAILURE
431 fi
432
433 if [ "$VERBOSE" ]; then
434 title="$msg_done"
435 msg=$( printf "$msg_removed_file" \
436 "$_PATH_LOCALTIME" )
437 if [ "$USEDIALOG" ]; then
427 else
428 f_err "%s\n" "$err"
429 fi
430 return $FAILURE
431 fi
432
433 if [ "$VERBOSE" ]; then
434 title="$msg_done"
435 msg=$( printf "$msg_removed_file" \
436 "$_PATH_LOCALTIME" )
437 if [ "$USEDIALOG" ]; then
438 size=$( f_dialog_buttonbox_size \
439 "$title" \
440 "$btitle" \
441 "$msg" )
442 eval $DIALOG \
443 --title \"\$title\" \
444 --backtitle \"\$btitle\" \
445 --ok-label \"\$msg_ok\" \
446 --msgbox \"\$msg\" $size
438 f_dialog_buttonbox_size height width \
439 "$title" \
440 "$btitle" \
441 "$msg"
442 $DIALOG \
443 --title "$title" \
444 --backtitle "$btitle" \
445 --ok-label "$msg_ok" \
446 --msgbox "$msg" $height $width
447 else
448 printf "%s\n" "$msg"
449 fi
450 fi
451
452 return $SUCCESS
453
454 fi # ! zoneinfo_file
455
456 if [ "$copymode" ]; then
457
458 err=$( rm -f "$_PATH_LOCALTIME" 2>&1 )
459 if [ "$err" ]; then
460 if [ "$USEDIALOG" ]; then
447 else
448 printf "%s\n" "$msg"
449 fi
450 fi
451
452 return $SUCCESS
453
454 fi # ! zoneinfo_file
455
456 if [ "$copymode" ]; then
457
458 err=$( rm -f "$_PATH_LOCALTIME" 2>&1 )
459 if [ "$err" ]; then
460 if [ "$USEDIALOG" ]; then
461 size=$( f_dialog_buttonbox_size \
462 "$title" \
463 "$btitle" \
464 "$err" )
465 eval $DIALOG \
466 --title \"\$title\" \
467 --backtitle \"\$btitle\" \
468 --ok-label \"\$msg_ok\" \
469 --msgbox \"\$err\" $size
461 f_dialog_buttonbox_size height width \
462 "$title" \
463 "$btitle" \
464 "$err"
465 $DIALOG \
466 --title "$title" \
467 --backtitle "$btitle" \
468 --ok-label "$msg_ok" \
469 --msgbox "$err" $height $width
470 else
471 f_err "%s\n" "$err"
472 fi
473 return $FAILURE
474 fi
475
476 err=$( umask 222 && : 2>&1 > "$_PATH_LOCALTIME" )
477 if [ "$err" ]; then
478 if [ "$USEDIALOG" ]; then
470 else
471 f_err "%s\n" "$err"
472 fi
473 return $FAILURE
474 fi
475
476 err=$( umask 222 && : 2>&1 > "$_PATH_LOCALTIME" )
477 if [ "$err" ]; then
478 if [ "$USEDIALOG" ]; then
479 size=$( f_dialog_buttonbox_size \
480 "$title" \
481 "$btitle" \
482 "$err" )
483 eval $DIALOG \
484 --title \"\$title\" \
485 --backtitle \"\$btitle\" \
486 --ok-label \"\$msg_ok\" \
487 --msgbox \"\$err\" $size
479 f_dialog_buttonbox_size height width \
480 "$title" \
481 "$btitle" \
482 "$err"
483 $DIALOG \
484 --title "$title" \
485 --backtitle "$btitle" \
486 --ok-label "$msg_ok" \
487 --msgbox "$err" $height $width
488 else
489 f_err "%s\n" "$err"
490 fi
491 return $FAILURE
492 fi
493
494 err=$( cat "$zoneinfo_file" 2>&1 > "$_PATH_LOCALTIME" )
495 if [ "$err" ]; then
496 if [ "$USEDIALOG" ]; then
488 else
489 f_err "%s\n" "$err"
490 fi
491 return $FAILURE
492 fi
493
494 err=$( cat "$zoneinfo_file" 2>&1 > "$_PATH_LOCALTIME" )
495 if [ "$err" ]; then
496 if [ "$USEDIALOG" ]; then
497 size=$( f_dialog_buttonbox_size \
498 "$title" \
499 "$btitle" \
500 "$err" )
501 eval $DIALOG \
502 --title \"\$title\" \
503 --backtitle \"\$btitle\" \
504 --ok-label \"\$msg_ok\" \
505 --msgbox \"\$err\" $size
497 f_dialog_buttonbox_size height width \
498 "$title" \
499 "$btitle" \
500 "$err"
501 $DIALOG \
502 --title "$title" \
503 --backtitle "$btitle" \
504 --ok-label "$msg_ok" \
505 --msgbox "$err" $height $width
506 else
507 f_err "%s\n" "$err"
508 fi
509 return $FAILURE
510 fi
511
512 else # ! copymode
513
514 err=$( ( :< "$zoneinfo_file" ) 2>&1 )
515 if [ "$err" ]; then
516 if [ "$USEDIALOG" ]; then
506 else
507 f_err "%s\n" "$err"
508 fi
509 return $FAILURE
510 fi
511
512 else # ! copymode
513
514 err=$( ( :< "$zoneinfo_file" ) 2>&1 )
515 if [ "$err" ]; then
516 if [ "$USEDIALOG" ]; then
517 size=$( f_dialog_buttonbox_size \
518 "$title" \
519 "$btitle" \
520 "$err" )
521 eval $DIALOG \
522 --title \"\$title\" \
523 --backtitle \"\$btitle\" \
524 --ok-label \"\$msg_ok\" \
525 --msgbox \"\$err\" $size
517 f_dialog_buttonbox_size height width \
518 "$title" \
519 "$btitle" \
520 "$err"
521 $DIALOG \
522 --title "$title" \
523 --backtitle "$btitle" \
524 --ok-label "$msg_ok" \
525 --msgbox "$err" $height $width
526 else
527 f_err "%s\n" "$err"
528 fi
529 return $FAILURE
530 fi
531
532 err=$( rm -f "$_PATH_LOCALTIME" 2>&1 )
533 if [ "$err" ]; then
534 if [ "$USEDIALOG" ]; then
526 else
527 f_err "%s\n" "$err"
528 fi
529 return $FAILURE
530 fi
531
532 err=$( rm -f "$_PATH_LOCALTIME" 2>&1 )
533 if [ "$err" ]; then
534 if [ "$USEDIALOG" ]; then
535 size=$( f_dialog_buttonbox_size \
536 "$title" \
537 "$btitle" \
538 "$err" )
539 eval $DIALOG \
540 --title \"\$title\" \
541 --backtitle \"\$btitle\" \
542 --ok-label \"\$msg_ok\" \
543 --msgbox \"\$err\" $size
535 f_dialog_buttonbox_size height width \
536 "$title" \
537 "$btitle" \
538 "$err"
539 $DIALOG \
540 --title "$title" \
541 --backtitle "$btitle" \
542 --ok-label "$msg_ok" \
543 --msgbox "$err" $height $width
544 else
545 f_err "%s\n" "$err"
546 fi
547 return $FAILURE
548 fi
549
550 err=$( ln -s "$zoneinfo_file" "$_PATH_LOCALTIME" 2>&1 )
551 if [ "$err" ]; then
552 if [ "$USEDIALOG" ]; then
544 else
545 f_err "%s\n" "$err"
546 fi
547 return $FAILURE
548 fi
549
550 err=$( ln -s "$zoneinfo_file" "$_PATH_LOCALTIME" 2>&1 )
551 if [ "$err" ]; then
552 if [ "$USEDIALOG" ]; then
553 size=$( f_dialog_buttonbox_size \
554 "$title" \
555 "$btitle" \
556 "$err" )
557 eval $DIALOG \
558 --title \"\$title\" \
559 --backtitle \"\$btitle\" \
560 --ok-label \"\$msg_ok\" \
561 --msgbox \"\$err\" $size
553 f_dialog_buttonbox_size height $width \
554 "$title" \
555 "$btitle" \
556 "$err"
557 $DIALOG \
558 --title "$title" \
559 --backtitle "$btitle" \
560 --ok-label "$msg_ok" \
561 --msgbox "$err" $height $width
562 else
563 f_err "%s\n" "$err"
564 fi
565 return $FAILURE
566 fi
567
568 fi # copymode
569

--- 4 unchanged lines hidden (view full) ---

574 "$zoneinfo_file" \
575 "$_PATH_LOCALTIME" )
576 else
577 msg=$( printf "$msg_created_symlink" \
578 "$_PATH_LOCALTIME" \
579 "$zoneinfo_file" )
580 fi
581 if [ "$USEDIALOG" ]; then
562 else
563 f_err "%s\n" "$err"
564 fi
565 return $FAILURE
566 fi
567
568 fi # copymode
569

--- 4 unchanged lines hidden (view full) ---

574 "$zoneinfo_file" \
575 "$_PATH_LOCALTIME" )
576 else
577 msg=$( printf "$msg_created_symlink" \
578 "$_PATH_LOCALTIME" \
579 "$zoneinfo_file" )
580 fi
581 if [ "$USEDIALOG" ]; then
582 size=$( f_dialog_buttonbox_size \
583 "$title" "$btitle" "$msg" )
584 eval $DIALOG \
585 --title \"\$title\" \
586 --backtitle \"\$btitle\" \
587 --ok-label \"\$msg_ok\" \
588 --msgbox \"\$msg\" $size
582 f_dialog_buttonbox_size height width \
583 "$title" "$btitle" "$msg"
584 $DIALOG \
585 --title "$title" \
586 --backtitle "$btitle" \
587 --ok-label "$msg_ok" \
588 --msgbox "$msg" $height $width
589 else
590 printf "%s\n" "$msg"
591 fi
592 fi
593
594 fi # REALLYDOIT
595
596 return $SUCCESS

--- 79 unchanged lines hidden --- 		589 else
590 printf "%s\n" "$msg"
591 fi
592 fi
593
594 fi # REALLYDOIT
595
596 return $SUCCESS

--- 79 unchanged lines hidden ---