Index: openacs-4/packages/acs-subsite/tcl/email-image-procs.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/acs-subsite/tcl/email-image-procs.tcl,v diff -u -N -r1.21.2.4 -r1.21.2.5 --- openacs-4/packages/acs-subsite/tcl/email-image-procs.tcl 8 Feb 2024 18:04:05 -0000 1.21.2.4 +++ openacs-4/packages/acs-subsite/tcl/email-image-procs.tcl 26 Feb 2024 09:57:18 -0000 1.21.2.5 @@ -173,19 +173,19 @@ set bg "xc:$bgcolor" # Creating an image of the right length where the email will be - if {[catch {exec convert -size $size $bg $dest_path} errmsg]} { + if {[catch {exec [::util::which convert] -size $size $bg $dest_path} errmsg]} { return "" } # Creating the image with the email of the user on it - if {[catch {exec convert -font $font_type -fill blue -pointsize $font_size -draw "text 0,$ypos $email" \ + if {[catch {exec [::util::which convert] -font $font_type -fill blue -pointsize $font_size -draw "text 0,$ypos $email" \ $dest_path $dest_path} errmsg]} { return "" } if { $transparent eq "" || $transparent eq "1" } { # Making the bg color transparent - if {[catch {exec convert $dest_path -transparent $bgcolor $dest_path} errmsg]} { + if {[catch {exec [::util::which convert] $dest_path -transparent $bgcolor $dest_path} errmsg]} { return "" } } @@ -258,18 +258,18 @@ set bg "xc:$bgcolor" # Creating an image of the right length where the email will be - if { [catch { exec convert -size $size $bg $dest_path } ] } { + if { [catch { exec [::util::which convert] -size $size $bg $dest_path } ] } { # ImageMagick not present return } # Creating the image with the email of the user on it - exec convert -font $font_type -fill blue -pointsize $font_size -draw "text 0,$ypos $new_email" \ + exec [::util::which convert] -font $font_type -fill blue -pointsize $font_size -draw "text 0,$ypos $new_email" \ $dest_path $dest_path if { $transparent eq "" || $transparent eq "1" } { # Making the bg color transparent - exec convert $dest_path -transparent $bgcolor $dest_path + exec [::util::which convert] $dest_path -transparent $bgcolor $dest_path } set email_image_id [email_image::get_related_item_id -user_id $user_id] Index: openacs-4/packages/acs-subsite/www/shared/portrait-bits.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/acs-subsite/www/shared/portrait-bits.tcl,v diff -u -N -r1.20.2.1 -r1.20.2.2 --- openacs-4/packages/acs-subsite/www/shared/portrait-bits.tcl 21 Jul 2020 14:08:50 -0000 1.20.2.1 +++ openacs-4/packages/acs-subsite/www/shared/portrait-bits.tcl 26 Feb 2024 09:57:18 -0000 1.20.2.2 @@ -57,7 +57,7 @@ "file" { set input_file [content::revision::get_cr_file_path -revision_id $itemInfo(revision_id)] ad_try { - exec convert $input_file -resize $size $filename + exec [::util::which convert] $input_file -resize $size $filename } on error {errorMsg} { ad_log warning "portrait-bits: convert returned error: $errorMsg" ns_returnfile 200 $default_avatar_mime $default_avatar @@ -74,7 +74,7 @@ where revision_id = :revision_id } -file $input_file ad_try { - exec convert $input_file -resize $size $filename + exec [::util::which convert] $input_file -resize $size $filename } on error {errorMsg} { ad_log warning "portrait-bits: convert returned error: $errorMsg" ns_returnfile 200 $default_avatar_mime $default_avatar Index: openacs-4/packages/evaluation-portlet/tcl/test/tclwebtest-procs.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/evaluation-portlet/tcl/test/tclwebtest-procs.tcl,v diff -u -N -r1.6.2.6 -r1.6.2.7 --- openacs-4/packages/evaluation-portlet/tcl/test/tclwebtest-procs.tcl 21 Dec 2021 08:12:33 -0000 1.6.2.6 +++ openacs-4/packages/evaluation-portlet/tcl/test/tclwebtest-procs.tcl 26 Feb 2024 09:57:18 -0000 1.6.2.7 @@ -12,9 +12,9 @@ # Create a temporal file set file_name "[ad_tmpdir]/$file_name" - exec touch $file_name - exec ls / >> $file_name - exec chmod 777 $file_name + exec [::util::which touch] $file_name + exec [::util::which ls] / >> $file_name + exec [::util::which chmod[ 777 $file_name return $file_name } Index: openacs-4/packages/file-storage/tcl/test/webtest-procs.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/file-storage/tcl/test/Attic/webtest-procs.tcl,v diff -u -N -r1.1.2.14 -r1.1.2.15 --- openacs-4/packages/file-storage/tcl/test/webtest-procs.tcl 27 Nov 2022 10:52:26 -0000 1.1.2.14 +++ openacs-4/packages/file-storage/tcl/test/webtest-procs.tcl 26 Feb 2024 09:57:18 -0000 1.1.2.15 @@ -209,9 +209,9 @@ } { # Create a temporary file set file_name "[ad_tmpdir]/$f_name.txt" - exec touch $file_name - exec ls / >> $file_name - exec chmod 777 $file_name + exec [::util::which touch] $file_name + exec [::util::which ls] / >> $file_name + exec [::util::which chmod] 777 $file_name return $file_name } } Index: openacs-4/packages/xotcl-request-monitor/www/index.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/xotcl-request-monitor/www/index.tcl,v diff -u -N -r1.31.2.8 -r1.31.2.9 --- openacs-4/packages/xotcl-request-monitor/www/index.tcl 6 Oct 2023 09:07:24 -0000 1.31.2.8 +++ openacs-4/packages/xotcl-request-monitor/www/index.tcl 26 Feb 2024 09:57:18 -0000 1.31.2.9 @@ -42,10 +42,10 @@ set f [open $procloadavg]; set c [read $f]; close $f return $c } - if {![catch {exec sysctl vm.loadavg kern.boottime} result]} { + if {![catch {exec [::util::which sysctl] vm.loadavg kern.boottime} result]} { return $result } - if {[set uptime [util::which uptime]] ne ""} { + if {[set uptime [::util::which uptime]] ne ""} { return [exec $uptime] } else { set msg "'uptime' command not found on the system" Index: openacs-4/packages/xowiki/www/ckeditor-images/upload_image.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/xowiki/www/ckeditor-images/upload_image.tcl,v diff -u -N -r1.10.2.4 -r1.10.2.5 --- openacs-4/packages/xowiki/www/ckeditor-images/upload_image.tcl 13 Jul 2020 12:02:34 -0000 1.10.2.4 +++ openacs-4/packages/xowiki/www/ckeditor-images/upload_image.tcl 26 Feb 2024 09:57:18 -0000 1.10.2.5 @@ -29,7 +29,9 @@ set mime_type [::xowiki::guesstype $file_name] set tmp_size [ad_file size $upload_tmpfile] - if {$size ne ""} {exec convert -resize $size $upload_tmpfile $upload_tmpfile} + if {$size ne ""} { + exec [::util::which convert] -resize $size $upload_tmpfile $upload_tmpfile + } if {![regexp (image/*|audio/mpeg|application/x-shockwave-flash|application/vnd.adobe.flash-movie|video/mp4) $mime_type]} { #template::form::set_error "upload_image" "upload_file" "[_ tlf-resource-integrator.HTMLArea_SelectImageUploadNoImage]" break