aboutsummaryrefslogtreecommitdiff
path: root/Build
diff options
context:
space:
mode:
authorGravatar Joey Hess <joeyh@joeyh.name>2016-10-04 16:37:43 -0400
committerGravatar Joey Hess <joeyh@joeyh.name>2016-10-04 16:37:43 -0400
commit218ceacf5dffd328fcc08e6e775f43cffa887238 (patch)
tree0340232fd51eb59cec8d48624814f5e32351a2c4 /Build
parent2c2b8f0ec2ce32550ac79ae7c367104f68ec37b6 (diff)
Linux standalone: Include locale files in the bundle, and generate locale definition files for the locales in use when starting runshell.
Currently only done for utf-8 locales because the charset can easily be told for those. Other locales don't include the charset in their name. The locale definition is generated under git-annex.linux/locales. So, this only works if the user can write there. If locale generation fails for any reason, it's silently skipped. The git-annex-standalone.deb installs the bundle under /usr, so this locale generation won't work for non-root users.
Diffstat (limited to 'Build')
-rw-r--r--Build/BundledPrograms.hs2
1 files changed, 2 insertions, 0 deletions
diff --git a/Build/BundledPrograms.hs b/Build/BundledPrograms.hs
index 69d72b461..a9a29b603 100644
--- a/Build/BundledPrograms.hs
+++ b/Build/BundledPrograms.hs
@@ -91,6 +91,8 @@ preferredBundledPrograms = catMaybes
-- used to unpack the tarball when upgrading
, Just "gunzip"
, Just "tar"
+ -- used by runshell to generate locales
+ , Just "localedef"
#endif
-- nice, ionice, and nocache are not included in the bundle;
-- we rely on the system's own version, which may better match