texlive[50457] Master/tlpkg/installer/install-tl-gui.tcl: More

commits+siepo at tug.org commits+siepo at tug.org
Mon Mar 18 23:22:27 CET 2019


Revision: 50457
          http://tug.org/svn/texlive?view=revision&revision=50457
Author:   siepo
Date:     2019-03-18 23:22:27 +0100 (Mon, 18 Mar 2019)
Log Message:
-----------
More consistent slashes

Modified Paths:
--------------
    trunk/Master/tlpkg/installer/install-tl-gui.tcl

Modified: trunk/Master/tlpkg/installer/install-tl-gui.tcl
===================================================================
--- trunk/Master/tlpkg/installer/install-tl-gui.tcl	2019-03-18 22:19:23 UTC (rev 50456)
+++ trunk/Master/tlpkg/installer/install-tl-gui.tcl	2019-03-18 22:22:27 UTC (rev 50457)
@@ -147,16 +147,21 @@
 
 # regular read_line
 proc read_line {} {
-  if [catch {chan gets $::inst l} len] {
-    # catch [chan close $::inst]
-    err_exit "
+  while 1 {
+    if [catch {chan gets $::inst l} len] {
+      # catch [chan close $::inst]
+      err_exit "
 Error while reading from Perl back end.
 This should not have happened!"
-  } elseif {$len < 0} {
-    # catch [chan close $::inst]
-    return [list -1 ""]
-  } else {
-    return [list $len $l]
+    } elseif {$len < 0} {
+      # catch [chan close $::inst]
+      return [list -1 ""]
+    } elseif {[string range $l 0 1] eq "D:" || [string range $l 0 2] eq "DD:" \
+               || [string range $l 0 3] eq "DDD:"} {
+      lappend ::out_log $l
+    } else {
+      return [list $len $l]
+    }
   }
 }; # read_line
 
@@ -426,10 +431,10 @@
   # path components, as labels
   incr rw
   pgrid [ttk::label .tltd.prefix_l] -in .tltd.fr1 -row $rw -column 0
-  pgrid [ttk::label .tltd.sep0_l -text [file separator]] \
+  pgrid [ttk::label .tltd.sep0_l -text "/"] \
       -in .tltd.fr1 -row $rw -column 1
   pgrid [ttk::label .tltd.name_l] -in .tltd.fr1 -row $rw -column 2
-  pgrid [ttk::label .tltd.sep1_l -text [file separator]] \
+  pgrid [ttk::label .tltd.sep1_l -text "/"] \
       -in .tltd.fr1 -row $rw -column 3
   pgrid [ttk::label .tltd.rel_l -width 6] \
       -in .tltd.fr1 -row $rw -column 4
@@ -495,7 +500,7 @@
   if {$initdir eq "" || \
           ($::tcl_platform(platform) eq "windows" && \
                [string index $initdir end] eq ":")} {
-    append initdir [file separator]
+    append initdir "/"
   }
   .tltd.prefix_l configure -text $initdir
   update_full_path
@@ -548,7 +553,7 @@
   wm resizable .td 1 0
   place_dlg .td .
   tkwait window .td
-  if {$::dialog_ans ne ""} {set ::vars($d) $::dialog_ans}
+  if {$::dialog_ans ne ""} {set ::vars($d) [forward_slashify $::dialog_ans]}
 }
 
 proc toggle_port {} {



More information about the tex-live-commits mailing list