Browse Source

fix regexp for examining mount output

master
Julian Noble 4 days ago
parent
commit
56795bbf65
  1. 2
      src/bootsupport/modules/punk/winlnk-0.1.0.tm
  2. 2
      src/modules/punk/winlnk-999999.0a1.0.tm
  3. 2
      src/project_layouts/custom/_project/punk.project-0.1/src/bootsupport/modules/punk/winlnk-0.1.0.tm
  4. 2
      src/project_layouts/custom/_project/punk.shell-0.1/src/bootsupport/modules/punk/winlnk-0.1.0.tm
  5. 2
      src/vfs/_vfscommon.vfs/modules/punk/winlnk-0.1.0.tm

2
src/bootsupport/modules/punk/winlnk-0.1.0.tm

@ -625,7 +625,7 @@ tcl::namespace::eval punk::winlnk {
foreach line [split $mountinfo "\n"] {
#review - a more specific mount target might exist that includes the drive letter as part of the mount point name and is a longer prefix of the localbase_path
#- we should probably look for the longest prefix match rather than just the drive letter
if {[regexp -nocase -- [string cat ^$drive_letter {:\\\s+on\s+(\S)}] $line _match mount_point]} {
if {[regexp -nocase -- [string cat ^$drive_letter {:\\\s+on\s+(\S+)}] $line _match mount_point]} {
set link_target [file join $mount_point $tail $suffix_path]
break
}

2
src/modules/punk/winlnk-999999.0a1.0.tm

@ -625,7 +625,7 @@ tcl::namespace::eval punk::winlnk {
foreach line [split $mountinfo "\n"] {
#review - a more specific mount target might exist that includes the drive letter as part of the mount point name and is a longer prefix of the localbase_path
#- we should probably look for the longest prefix match rather than just the drive letter
if {[regexp -nocase -- [string cat ^$drive_letter {:\\\s+on\s+(\S)}] $line _match mount_point]} {
if {[regexp -nocase -- [string cat ^$drive_letter {:\\\s+on\s+(\S+)}] $line _match mount_point]} {
set link_target [file join $mount_point $tail $suffix_path]
break
}

2
src/project_layouts/custom/_project/punk.project-0.1/src/bootsupport/modules/punk/winlnk-0.1.0.tm

@ -625,7 +625,7 @@ tcl::namespace::eval punk::winlnk {
foreach line [split $mountinfo "\n"] {
#review - a more specific mount target might exist that includes the drive letter as part of the mount point name and is a longer prefix of the localbase_path
#- we should probably look for the longest prefix match rather than just the drive letter
if {[regexp -nocase -- [string cat ^$drive_letter {:\\\s+on\s+(\S)}] $line _match mount_point]} {
if {[regexp -nocase -- [string cat ^$drive_letter {:\\\s+on\s+(\S+)}] $line _match mount_point]} {
set link_target [file join $mount_point $tail $suffix_path]
break
}

2
src/project_layouts/custom/_project/punk.shell-0.1/src/bootsupport/modules/punk/winlnk-0.1.0.tm

@ -625,7 +625,7 @@ tcl::namespace::eval punk::winlnk {
foreach line [split $mountinfo "\n"] {
#review - a more specific mount target might exist that includes the drive letter as part of the mount point name and is a longer prefix of the localbase_path
#- we should probably look for the longest prefix match rather than just the drive letter
if {[regexp -nocase -- [string cat ^$drive_letter {:\\\s+on\s+(\S)}] $line _match mount_point]} {
if {[regexp -nocase -- [string cat ^$drive_letter {:\\\s+on\s+(\S+)}] $line _match mount_point]} {
set link_target [file join $mount_point $tail $suffix_path]
break
}

2
src/vfs/_vfscommon.vfs/modules/punk/winlnk-0.1.0.tm

@ -625,7 +625,7 @@ tcl::namespace::eval punk::winlnk {
foreach line [split $mountinfo "\n"] {
#review - a more specific mount target might exist that includes the drive letter as part of the mount point name and is a longer prefix of the localbase_path
#- we should probably look for the longest prefix match rather than just the drive letter
if {[regexp -nocase -- [string cat ^$drive_letter {:\\\s+on\s+(\S)}] $line _match mount_point]} {
if {[regexp -nocase -- [string cat ^$drive_letter {:\\\s+on\s+(\S+)}] $line _match mount_point]} {
set link_target [file join $mount_point $tail $suffix_path]
break
}

Loading…
Cancel
Save