--- doc/loncapafiles/removenolongerused.piml 2013/08/07 18:30:49 1.1.2.1 +++ doc/loncapafiles/removenolongerused.piml 2013/08/31 00:29:28 1.1.2.5 @@ -5,7 +5,7 @@ -use File::Path qw(remove_tree); +use File::Path(); my %paths = ( 'londaemons' => '/home/httpd/perl', @@ -14,9 +14,9 @@ my %paths = ( ); my %files = ( - 'londaemons' => ['lonManage','lchtmldir','lonhttpd'], + 'londaemons' => ['lonManage','lchtmldir','lonhttpd','lcuseradd','lonc'], 'apache' => ['londropadd.pm','lonconstruct.pm', - 'admbookmarks.pm'], + 'admbookmarks.pm','lonassignments.pm'], 'londocroot' => ['adm/rat/extpickcode.html', 'adm/rat/extpickframe.html'], ); @@ -55,12 +55,13 @@ foreach my $key (sort(keys(%dirs))) { if (@dirstodelete > 0) { print "\nThe following directories were installed for an earlier version of LON-CAPA, and are no longer needed. It is recommended that you delete them. For each one, enter Y if you would the directory to be deleted.\n\n"; foreach my $dir (@dirstodelete) { - next if (($dir =~/*/) || ($dir eq '') || ($dir eq '/')); + next if (($dir =~/\*/) || ($dir eq '') || ($dir eq '/')); print "$dir -- delete? Enter: Y or N:\n"; my $choice=<>; chomp($choice); - if ($choice==Y) { - remove_tree($dir); + $choice =~ s/\s+//g; + if ($choice eq 'Y') { + File::Path::remove_tree($dir); } } } @@ -68,11 +69,12 @@ if (@dirstodelete > 0) { if (@filestodelete > 0) { print "\nThe following files were installed for an earlier version of LON-CAPA, and are no longer needed. It is recommended that you delete them. For each one, enter Y if you would the file to be deleted.\n\n"; foreach my $file (@filestodelete) { - next if (($file =~/*/) || ($file eq '') || ($file eq '/')); + next if (($file =~/\*/) || ($file eq '') || ($file eq '/')); print "$file -- remove? Enter? Y or N:\n"; my $choice=<>; chomp($choice); - if ($choice==Y) { + $choice =~ s/\s+//g; + if ($choice eq 'Y') { unlink($file); } }