Configuration fix for OS X: no more testing for viewers.

git-svn-id: svn://tug.org/texlive/trunk@9693 c570f23f-e606-0410-a88d-b1316a301751

2 files changed, 25 insertions, 21 deletions

diff --git a/Master/texmf-dist/scripts/epspdf/epspdfrc.rb b/Master/texmf-dist/scripts/epspdf/epspdfrc.rb
index f75d65b5339..aa64309a822 100755
--- a/Master/texmf-dist/scripts/epspdf/epspdfrc.rb
+++ b/Master/texmf-dist/scripts/epspdf/epspdfrc.rb
@@ -424,20 +424,22 @@ class << $settings
       self.pdftops_prog = xpdf_version( 'pdftops' ) ? 'pdftops' : nil
 
       # viewers
-      vw = %w{ gpdf xpdf acroread evince ggv gv kghostview }
-      vw.delete_if { |x| not is_a_program( x ) }
-      vw = nil if vw.empty?
-      self.pdf_viewers = vw
-      self.pdf_viewer = vw ? vw[0] : nil
-      if vw
-        vw2 = vw.dup # copy the elements rather than the array ref
-        [ 'gpdf', 'xpdf', 'acroread' ].each { |pg|
-          vw2.delete( pg ) if vw2.index( pg )
-        }
-        vw2 = nil if vw2.empty?
-        self.ps_viewers = vw2
-        self.ps_viewer = vw2 ? vw2[ 0 ] : nil
-      end # if vw
+      if ARCH == 'unix'
+        vw = %w{ gpdf xpdf acroread evince ggv gv kghostview }
+        vw.delete_if { |x| not is_a_program( x ) }
+        vw = nil if vw.empty?
+        self.pdf_viewers = vw
+        self.pdf_viewer = vw ? vw[0] : nil
+        if vw
+          vw2 = vw.dup # copy the elements rather than the array ref
+          [ 'gpdf', 'xpdf', 'acroread' ].each { |pg|
+            vw2.delete( pg ) if vw2.index( pg )
+          }
+          vw2 = nil if vw2.empty?
+          self.ps_viewers = vw2
+          self.ps_viewer = vw2 ? vw2[ 0 ] : nil
+        end # if vw
+      end # if unix
     end # case
 
     # built-in defaults already set during initialization of $settings
diff --git a/Master/texmf-dist/scripts/epspdf/epspdftk.rb b/Master/texmf-dist/scripts/epspdf/epspdftk.rb
index c09509c0c8f..f480a594c2f 100755
--- a/Master/texmf-dist/scripts/epspdf/epspdftk.rb
+++ b/Master/texmf-dist/scripts/epspdf/epspdftk.rb
@@ -320,12 +320,14 @@ if not $settings.gs_prog
   abort
 end
 
-if not $settings.pdf_viewer
-  Tk.messageBox( :icon=>'warning', :type=>'ok', :message =>
-    "No PostScript- or pdf viewer found" )
-elsif not $settings.ps_viewer
-  Tk.messageBox( :icon=>'warning', :type=>'ok', :message =>
-    "No PostScript viewer found" )
+if ARCH != 'osx'
+  if not $settings.pdf_viewer
+    Tk.messageBox( :icon=>'warning', :type=>'ok', :message =>
+      "No PostScript- or pdf viewer found" )
+  elsif not $settings.ps_viewer
+    Tk.messageBox( :icon=>'warning', :type=>'ok', :message =>
+      "No PostScript viewer found" )
+  end
 end
 
 ########################################
@@ -889,7 +891,7 @@ TkFrame.new( $root ) { |frm|
           $tl_wait.overrideredirect( 1 )
         end
         $cnv_label.configure(
-          'text' => "Converting #{$source.path} to \n    #{path} ..."
+          'text' => "Converting #{$source.path} to \n    #{path}..."
         )
         $tl_wait.update
         $tl_wait.deiconify