Index: openacs-4/packages/acs-admin/tcl/apm-admin-procs.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-admin/tcl/apm-admin-procs.tcl,v
diff -u -N -r1.20.2.10 -r1.20.2.11
--- openacs-4/packages/acs-admin/tcl/apm-admin-procs.tcl 27 Mar 2017 10:56:21 -0000 1.20.2.10
+++ openacs-4/packages/acs-admin/tcl/apm-admin-procs.tcl 28 Mar 2017 06:46:51 -0000 1.20.2.11
@@ -632,9 +632,9 @@
file delete -force -- $repository_bak
}
if { [file exists $repository_dirname] } {
- file rename $repository_dirname $repository_bak
+ file rename -- $repository_dirname $repository_bak
}
- file rename $work_repository_dirname $repository_dirname
+ file rename -- $work_repository_dirname $repository_dirname
ns_log Debug "Repository: DONE"
Index: openacs-4/packages/acs-admin/www/apm/build-repository.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-admin/www/apm/Attic/build-repository.tcl,v
diff -u -N -r1.18.2.4 -r1.18.2.5
--- openacs-4/packages/acs-admin/www/apm/build-repository.tcl 27 Mar 2017 10:56:21 -0000 1.18.2.4
+++ openacs-4/packages/acs-admin/www/apm/build-repository.tcl 28 Mar 2017 06:46:51 -0000 1.18.2.5
@@ -300,9 +300,9 @@
file delete -force -- $repository_bak
}
if { [file exists $repository_dirname] } {
- file rename $repository_dirname $repository_bak
+ file rename -- $repository_dirname $repository_bak
}
-file rename $work_repository_dirname $repository_dirname
+file rename -- $work_repository_dirname $repository_dirname
ns_write " DONE
\n"
Index: openacs-4/packages/acs-bootstrap-installer/tcl/30-apm-load-procs.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-bootstrap-installer/tcl/30-apm-load-procs.tcl,v
diff -u -N -r1.43.2.4 -r1.43.2.5
--- openacs-4/packages/acs-bootstrap-installer/tcl/30-apm-load-procs.tcl 24 Feb 2017 14:44:35 -0000 1.43.2.4
+++ openacs-4/packages/acs-bootstrap-installer/tcl/30-apm-load-procs.tcl 28 Mar 2017 06:46:51 -0000 1.43.2.5
@@ -609,14 +609,14 @@
} {
set source $::acs::rootdir/packages/acs-bootstrap-installer/installer/tcl
foreach file [glob -nocomplain $source/*tcl] {
- file copy -force $file $::acs::rootdir/tcl/
+ file copy -force -- $file $::acs::rootdir/tcl/
}
set source $::acs::rootdir/packages/acs-bootstrap-installer/installer/www
foreach file [glob -nocomplain $source/*tcl $source/*adp] {
- file copy -force $file $::acs::rootdir/www/
+ file copy -force -- $file $::acs::rootdir/www/
}
foreach file [glob -nocomplain $source/SYSTEM/*tcl] {
- file copy -force $file $::acs::rootdir/www/SYSTEM/
+ file copy -force -- $file $::acs::rootdir/www/SYSTEM/
}
}
Index: openacs-4/packages/acs-developer-support/www/css-make-live.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-developer-support/www/css-make-live.tcl,v
diff -u -N -r1.3.2.1 -r1.3.2.2
--- openacs-4/packages/acs-developer-support/www/css-make-live.tcl 10 Sep 2015 08:21:23 -0000 1.3.2.1
+++ openacs-4/packages/acs-developer-support/www/css-make-live.tcl 28 Mar 2017 06:46:51 -0000 1.3.2.2
@@ -26,7 +26,7 @@
set source [content::revision::get_cr_file_path -revision_id $revision_id]
#todo check if files are stored in db
-file copy -force $source $target
+file copy -force -- $source $target
ad_returnredirect $return_url_2
Index: openacs-4/packages/acs-tcl/tcl/apm-file-procs.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-tcl/tcl/apm-file-procs.tcl,v
diff -u -N -r1.36.2.9 -r1.36.2.10
--- openacs-4/packages/acs-tcl/tcl/apm-file-procs.tcl 27 Mar 2017 10:33:29 -0000 1.36.2.9
+++ openacs-4/packages/acs-tcl/tcl/apm-file-procs.tcl 28 Mar 2017 06:46:51 -0000 1.36.2.10
@@ -486,7 +486,7 @@
set replyHeaders [ns_set create]
ns_http wait -file F -headers $replyHeaders -spoolsize 1 $h
if {[file exists $output_file_name]} {file delete -- $output_file_name}
- file rename $F $output_file_name
+ file rename -- $F $output_file_name
set location [ns_set iget $replyHeaders location]
if {$location eq ""} break
ns_log notice "Transfer $url redirected to $location ..."
Index: openacs-4/packages/acs-tcl/tcl/apm-install-procs.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-tcl/tcl/apm-install-procs.tcl,v
diff -u -N -r1.109.2.19 -r1.109.2.20
--- openacs-4/packages/acs-tcl/tcl/apm-install-procs.tcl 27 Mar 2017 10:33:29 -0000 1.109.2.19
+++ openacs-4/packages/acs-tcl/tcl/apm-install-procs.tcl 28 Mar 2017 06:46:51 -0000 1.109.2.20
@@ -805,7 +805,7 @@
}
# Move the package into the packages dir
- file rename $package_path $::acs::rootdir/packages
+ file rename -- $package_path $::acs::rootdir/packages
# We moved the spec file, so update its path
set package_path $old_package_path
@@ -1130,7 +1130,7 @@
apm_callback_and_log $callback "
Moving packages/$package_key to $backup_dir... "
- if { [catch { file rename "$::acs::rootdir/packages/$package_key" $backup_dir } error] } {
+ if { [catch { file rename -- "$::acs::rootdir/packages/$package_key" $backup_dir } error] } {
apm_callback_and_log $callback "[ns_quotehtml $error]"
} else {
apm_callback_and_log $callback "moved."
Index: openacs-4/packages/acs-tcl/tcl/utilities-procs.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-tcl/tcl/utilities-procs.tcl,v
diff -u -N -r1.140.2.65 -r1.140.2.66
--- openacs-4/packages/acs-tcl/tcl/utilities-procs.tcl 27 Mar 2017 10:33:29 -0000 1.140.2.65
+++ openacs-4/packages/acs-tcl/tcl/utilities-procs.tcl 28 Mar 2017 06:46:51 -0000 1.140.2.66
@@ -4235,7 +4235,7 @@
}
#exec "mv" "$file_path" "$backup_path"
- file rename $file_path $backup_path
+ file rename -- $file_path $backup_path
}
@@ -4878,7 +4878,7 @@
set dir [ad_tmpdir]/$key
foreach file [flib -nocomplain $dir/$id-*] {
file delete -- $file
- ns_log notice "FLUSH file delete $file"
+ ns_log notice "FLUSH file delete -- $file"
}
}
Index: openacs-4/packages/oacs-dav/tcl/tDAV-procs.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/oacs-dav/tcl/tDAV-procs.tcl,v
diff -u -N -r1.13.2.2 -r1.13.2.3
--- openacs-4/packages/oacs-dav/tcl/tDAV-procs.tcl 27 Mar 2017 10:41:51 -0000 1.13.2.2
+++ openacs-4/packages/oacs-dav/tcl/tDAV-procs.tcl 28 Mar 2017 06:46:51 -0000 1.13.2.3
@@ -249,7 +249,7 @@
proc tdav::move_props {uri newuri} {
set entry [tdav::get_prop_file $uri]
set dest [tdav::get_prop_file $newuri]
- catch {[file copy -force $entry $dest]}
+ catch {[file copy -force -- $entry $dest]}
}
# tdav::copy_props
@@ -268,7 +268,7 @@
proc tdav::copy_props {uri newuri} {
set entry [tdav::get_prop_file $uri]
set dest [tdav::get_prop_file $newuri]
- catch {[file copy -force $entry $dest]}
+ catch {[file copy -force -- $entry $dest]}
}
proc tdav::write_lock {uri list} {
@@ -998,13 +998,13 @@
set ret_code 412
} else {
set ret_code 204
- file copy -force $entry $local_dest
+ file copy -force -- $entry $local_dest
tdav::copy_props $uri $newuri
}
}
} else {
set ret_code 201
- file copy $entry $local_dest
+ file copy -- $entry $local_dest
tdav::copy_props $uri $newuri
}
}
@@ -1056,14 +1056,14 @@
} else {
set ret_code 204
file delete -force -- $local_dest
- file copy -force $entry $local_dest
+ file copy -force -- $entry $local_dest
file delete -force -- $entry
tdav::copy_props $uri $newuri
tdav::delete_props $uri
}
} else {
set ret_code 201
- file copy $entry $local_dest
+ file copy -- $entry $local_dest
tdav::copy_props $uri $newuri
file delete -force -- $entry
tdav::delete_props $uri
Index: openacs-4/packages/richtext-ckeditor4/tcl/richtext-procs.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/richtext-ckeditor4/tcl/richtext-procs.tcl,v
diff -u -N -r1.1.2.13 -r1.1.2.14
--- openacs-4/packages/richtext-ckeditor4/tcl/richtext-procs.tcl 12 Feb 2017 19:08:17 -0000 1.1.2.13
+++ openacs-4/packages/richtext-ckeditor4/tcl/richtext-procs.tcl 28 Mar 2017 06:46:51 -0000 1.1.2.14
@@ -245,7 +245,7 @@
#
set fn [dict get $result file]
set output [exec $unzip -o $fn -d $resources/$version]
- file rename $resources/$version/ckeditor $resources/$version/$ck_package
+ file rename -- $resources/$version/ckeditor $resources/$version/$ck_package
} else {
error "download of $download_url failed, HTTP status: [dict get $result status]"
}