← Back to branch summary

~cjwatson/ubiquity/new-partitioner

« back to all changes in this revision

Viewing changes to scripts/tzsetup

  • Committer: Colin Watson
  • Date: 2006-04-21 11:39:15 UTC
  • Revision ID: colin.watson@canonical.com-20060421113915-7d2d711cd6afc4f5
* Rename from espresso to ubiquity, to better suggest an association with
  Ubuntu. Log output now written to /var/log/installer/syslog rather than
  using the package name.

Show diffs side-by-side

added added

removed removed

Lines of Context:
scripts/tzsetup
25
25
        db_register time/zone time/zone # might be registered to something else
26
26
        # tzmap is also in oem-config-timezone (with a different path);
27
27
        # later, this should be moved into a tzsetup.deb.
28
 
        zone=$(grep "^$CC" /usr/lib/espresso/tzsetup/tzmap | cut -d ' ' -f 2)
 
28
        zone=$(grep "^$CC" /usr/lib/ubiquity/tzsetup/tzmap | cut -d ' ' -f 2)
29
29
        db_set time/zone "$zone"
30
30
        db_input high time/zone || true
31
31
        if ! db_go; then
34
34
fi
35
35
 
36
36
# Reconfigure locale according to the selected country. We rely on
37
 
# espresso/components/timezone.py having set debian-installer/country for
 
37
# ubiquity/components/timezone.py having set debian-installer/country for
38
38
# us.
39
39
db_get debian-installer/country
40
40
country="$RET"
42
42
newlocale="$(echo "$RET" | sed "s/_[A-Z][A-Z]*/_$country/")"
43
43
db_set debian-installer/locale "$newlocale"
44
44
db_fset debian-installer/locale seen true
45
 
PATH="/usr/lib/espresso/localechooser:$PATH" \
46
 
        /usr/lib/espresso/localechooser/localechooser
 
45
PATH="/usr/lib/ubiquity/localechooser:$PATH" \
 
46
        /usr/lib/ubiquity/localechooser/localechooser