D'oh!

[devedit.git] / modules / Tool.pm

diff --git a/modules/Tool.pm b/modules/Tool.pm
index 4dc6fa29e50d7b9aea731cb7d8a00d0f63d1ef5d..8efe0fa2cf43359707ce8fa0e825595b932f8b53 100644 (file)
--- a/modules/Tool.pm
+++ b/modules/Tool.pm
@@ -6,14 +6,14 @@ package Tool;
 # Some shared sub routines
 #
 # Author:        Patrick Canterino <patrick@patshaping.de>
 # Some shared sub routines
 #
 # Author:        Patrick Canterino <patrick@patshaping.de>

-# Last modified: 2010-12-23
+# Last modified: 2011-02-11

 #
 # Copyright (C) 1999-2000 Roland Bluethgen, Frank Schoenmann
 #
 # Copyright (C) 1999-2000 Roland Bluethgen, Frank Schoenmann

-# Copyright (C) 2003-2009 Patrick Canterino
+# Copyright (C) 2003-2011 Patrick Canterino

 # All Rights Reserved.
 #
 # This file can be distributed and/or modified under the terms of
 # All Rights Reserved.
 #
 # This file can be distributed and/or modified under the terms of

-# of the Artistic License 1.0 (see also the LICENSE file found at
+# of the Artistic License 2.0 (see also the LICENSE file found at

 # the top level of the Dev-Editor distribution).
 #
 
 # the top level of the Dev-Editor distribution).
 #
 


@@ -40,15 +40,18 @@ use base qw(Exporter);
              encode_html
              equal_url
              file_name
              encode_html
              equal_url
              file_name

-             is_archive

              in_array
              in_array

+             is_archive

              is_disabled_command
              is_forbidden_file
              mode_string
              multi_string
              upper_path);
              is_disabled_command
              is_forbidden_file
              mode_string
              multi_string
              upper_path);

-             
-my @archive_exts = ('.zip', 'tar.gz', 'tar.bz2');
+
+my @archive_exts = ('.zip',     '.tar', '.gz',
+                    '.tar.gz',  '.tgz', '.bz2',
+                    '.tar.bz2', '.tbz', '.tbz2',
+                    '.Z');

 
 # check_path()
 #
 
 # check_path()
 #


@@ -305,12 +308,12 @@ sub in_array($$)
 sub is_archive($)
 {
  my $file = shift;
 sub is_archive($)
 {
  my $file = shift;

- 
+

  foreach my $ext(@archive_exts)
  {
   return 1 if(lc(substr($file,length($file)-length($ext),length($ext))) eq lc($ext));
  }
  foreach my $ext(@archive_exts)
  {
   return 1 if(lc(substr($file,length($file)-length($ext),length($ext))) eq lc($ext));
  }

- 
+

  return;
 }
 
  return;
 }