Only warn if locale settings are broken

Keep running if calling `setlocale` fails, because of invalid locale settings.
athityakumar · Feb 8, 2020 · 96334da · 96334da
1 parent 7f5e9ab
commit 96334da
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 3 deletions.
diff --git a/lib/colorls/flags.rb b/lib/colorls/flags.rb
@@ -37,8 +37,7 @@ def initialize(*args)
     end
 
     def process
-      # initialize locale from environment
-      CLocale.setlocale(CLocale::LC_COLLATE, '')
+      init_locale
 
       @args = [Dir.pwd] if @args.empty?
       @args.sort!.each_with_index do |path, i|
@@ -71,6 +70,13 @@ def options
 
     private
 
+    def init_locale
+      # initialize locale from environment
+      CLocale.setlocale(CLocale::LC_COLLATE, '')
+    rescue RuntimeError => e
+      warn "WARN: #{e}"
+    end
+
     def add_sort_options(options)
       options.separator ''
       options.separator 'sorting options:'

diff --git a/man/colorls.1 b/man/colorls.1
@@ -1,7 +1,7 @@
 .\" generated with Ronn/v0.7.3
 .\" http://github.com/rtomayko/ronn/tree/0.7.3
 .
-.TH "COLORLS" "1" "July 2019" "colorls 1.2.0" "colorls Manual"
+.TH "COLORLS" "1" "July 2019" "colorls 1.3.3" "colorls Manual"
 .
 .SH "NAME"
 \fBcolorls\fR \- list directory contents with colors and icons