Skip to content

Commit 1d1a1f0

Browse files
committed
Fix unnecessary single quote escaping in Tcl code
Signed-off-by: Xavier Delaruelle <[email protected]>
1 parent c50ae06 commit 1d1a1f0

File tree

3 files changed

+14
-14
lines changed

3 files changed

+14
-14
lines changed

tcl/envmngt.tcl.in

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -273,15 +273,15 @@ proc renderSettings {} {
273273
lappend g_shcode_out "set $var=$val"
274274
}
275275
perl {
276-
set val [charEscaped $::env($var) \']
276+
set val [charEscaped $::env($var) ']
277277
lappend g_shcode_out "\$ENV{'$var'} = '$val';"
278278
}
279279
python {
280-
set val [charEscaped $::env($var) \']
280+
set val [charEscaped $::env($var) ']
281281
lappend g_shcode_out "os.environ\['$var'\] = '$val'"
282282
}
283283
ruby {
284-
set val [charEscaped $::env($var) \']
284+
set val [charEscaped $::env($var) ']
285285
lappend g_shcode_out "ENV\['$var'\] = '$val'"
286286
}
287287
lisp {
@@ -297,7 +297,7 @@ proc renderSettings {} {
297297
lappend g_shcode_out "Sys.setenv('$var'='$val')"
298298
}
299299
pwsh {
300-
set val [charEscaped $::env($var) \']
300+
set val [charEscaped $::env($var) ']
301301
lappend g_shcode_out "\$env:$var = '$val'"
302302
}
303303
}
@@ -519,12 +519,12 @@ proc renderSettings {} {
519519
lappend g_shcode_out "system(\"$xrdb -merge $var\");"
520520
}
521521
python {
522-
set var [charEscaped $var \']
522+
set var [charEscaped $var ']
523523
lappend g_shcode_out "subprocess.Popen(\['$xrdb',\
524524
'-merge', '$var'\])"
525525
}
526526
ruby {
527-
set var [charEscaped $var \']
527+
set var [charEscaped $var ']
528528
lappend g_shcode_out "Open3.popen2('$xrdb -merge $var')"
529529
}
530530
lisp {
@@ -564,16 +564,16 @@ proc renderSettings {} {
564564
lappend g_shcode_out {close XRDBPIPE;}
565565
}
566566
python {
567-
set var [charEscaped $var \']
568-
set val [charEscaped $val \']
567+
set var [charEscaped $var ']
568+
set val [charEscaped $val ']
569569
lappend g_shcode_out "subprocess.Popen(\['$xrdb',\
570570
'-merge'\],\
571571
stdin=subprocess.PIPE).communicate(input='$var:\
572572
$val\\n')"
573573
}
574574
ruby {
575-
set var [charEscaped $var \']
576-
set val [charEscaped $val \']
575+
set var [charEscaped $var ']
576+
set val [charEscaped $val ']
577577
lappend g_shcode_out "Open3.popen2('$xrdb -merge') {|i,o,t|\
578578
i.puts '$var: $val'}"
579579
}
@@ -643,14 +643,14 @@ proc renderSettings {} {
643643
}
644644
python {
645645
foreach var $xres_to_del {
646-
set var [charEscaped $var \']
646+
set var [charEscaped $var ']
647647
lappend g_shcode_out "subprocess.Popen(\['$xrdb', '-merge'\],\
648648
stdin=subprocess.PIPE).communicate(input='$var:\\n')"
649649
}
650650
}
651651
ruby {
652652
foreach var $xres_to_del {
653-
set var [charEscaped $var \']
653+
set var [charEscaped $var ']
654654
lappend g_shcode_out "Open3.popen2('$xrdb -merge') {|i,o,t|\
655655
i.puts '$var:'}"
656656
}

tcl/main.tcl.in

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -685,7 +685,7 @@ if {[catch {
685685
# Parse shell
686686
setState shell [lindex $argv 0]
687687
if {[getState shell] ni [getState supported_shells]} {
688-
reportErrorAndExit "Unknown shell type \'([getState shell])\'"
688+
reportErrorAndExit "Unknown shell type '([getState shell])'"
689689
}
690690

691691
# extract options and command switches from other args

tcl/subcmd.tcl.in

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2910,7 +2910,7 @@ proc cmdModuleModToSh {shell args} {
29102910

29112911
# set shell and shellType states to mod-to-sh target value
29122912
if {$shell ni [getState supported_shells]} {
2913-
reportErrorAndExit "Unsupported shell type \'$shell\'"
2913+
reportErrorAndExit "Unsupported shell type '$shell'"
29142914
}
29152915
##nagelfar ignore Found constant
29162916
setState shell $shell

0 commit comments

Comments
 (0)