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.9 -r1.20.2.10
--- openacs-4/packages/acs-admin/tcl/apm-admin-procs.tcl	16 Oct 2016 14:53:15 -0000	1.20.2.9
+++ openacs-4/packages/acs-admin/tcl/apm-admin-procs.tcl	27 Mar 2017 10:56:21 -0000	1.20.2.10
@@ -320,7 +320,7 @@
     #----------------------------------------------------------------------
 
     # Wipe and re-create the working directory
-    file delete -force $work_dir
+    file delete -force -- $work_dir
     file mkdir ${work_dir}
     set update_pretty_date [lc_time_fmt [clock format [clock seconds] -format "%Y-%m-%d %T"] %c]
     
@@ -332,8 +332,8 @@
         ns_log Notice "Repository: Channel $channel using tag $channel_tag($channel)"
         
         # Wipe and re-create the checkout directory
-        file delete -force "${work_dir}openacs-4"
-        file delete -force "${work_dir}dotlrn"
+        file delete -force -- "${work_dir}openacs-4"
+        file delete -force -- "${work_dir}dotlrn"
         file mkdir "${work_dir}dotlrn/packages"
         
         # Prepare channel directory
@@ -465,7 +465,7 @@
                                   file ${channel_dir}$pkg_info(package.key)-$pkg_info(name).apm:\
                                   \n$errmsg\n$::errorCode,$::errorInfo"
                             }
-                            file delete $tmp_filename
+                            file delete -- $tmp_filename
                         }
                         
                         set apm_url "${repository_url}$channel/$pkg_info(package.key)-$pkg_info(name).apm"
@@ -629,7 +629,7 @@
     ns_log Notice "Repository: Moving work repository $work_repository_dirname to live repository dir at <a href=\"/repository\/>$repository_dir</a>\n"
 
     if { [file exists $repository_bak] } {
-        file delete -force $repository_bak
+        file delete -force -- $repository_bak
     }
     if { [file exists $repository_dirname] } {
         file rename $repository_dirname $repository_bak
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.3 -r1.18.2.4
--- openacs-4/packages/acs-admin/www/apm/build-repository.tcl	18 Sep 2015 07:39:03 -0000	1.18.2.3
+++ openacs-4/packages/acs-admin/www/apm/build-repository.tcl	27 Mar 2017 10:56:21 -0000	1.18.2.4
@@ -98,15 +98,15 @@
 #----------------------------------------------------------------------
 
 # Wipe and re-create the working directory
-file delete -force $work_dir
+file delete -force -- $work_dir
 file mkdir ${work_dir}
 cd $work_dir
     
 foreach channel [lsort -decreasing [array names channel_tag]] {
     ns_write "<h2>Channel $channel using tag $channel_tag($channel)</h2><ul>"
 
     # Wipe and re-create the checkout directory
-    file delete -force "${work_dir}openacs-4"
+    file delete -force -- "${work_dir}openacs-4"
     
     # Prepare channel directory
     set channel_dir "${work_dir}repository/${channel}/"
@@ -297,7 +297,7 @@
 ns_write "<li>Moving work repository $work_repository_dirname to live repository dir at <a href=\"/repository\/>$repository_dir</a>\n"
 
 if { [file exists $repository_bak] } {
-    file delete -force $repository_bak
+    file delete -force -- $repository_bak
 }
 if { [file exists $repository_dirname] } {
     file rename $repository_dirname $repository_bak
Index: openacs-4/packages/acs-admin/www/apm/package-load-2.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-admin/www/apm/package-load-2.tcl,v
diff -u -N -r1.5.2.3 -r1.5.2.4
--- openacs-4/packages/acs-admin/www/apm/package-load-2.tcl	3 Feb 2017 13:15:14 -0000	1.5.2.3
+++ openacs-4/packages/acs-admin/www/apm/package-load-2.tcl	27 Mar 2017 10:56:21 -0000	1.5.2.4
@@ -24,7 +24,7 @@
 }
 
 if {$delete} {
-    file delete -force [apm_workspace_install_dir]
+    file delete -force -- [apm_workspace_install_dir]
 }
 
 set title "Contents of Loaded Package"