[pLog-svn] r3461 - plog/trunk/class/file/unpacker

[mark at devel.lifetype.net]

Author: mark
Date: 2006-05-25 15:48:14 +0000 (Thu, 25 May 2006)
New Revision: 3461

Modified:
   plog/trunk/class/file/unpacker/baseunpacker.class.php
   plog/trunk/class/file/unpacker/rarunpacker.class.php
   plog/trunk/class/file/unpacker/tarbz2unpacker.class.php
   plog/trunk/class/file/unpacker/targzunpacker.class.php
   plog/trunk/class/file/unpacker/zipunpacker.class.php
Log:
Fix a redeclare information.

Modified: plog/trunk/class/file/unpacker/baseunpacker.class.php
===================================================================
--- plog/trunk/class/file/unpacker/baseunpacker.class.php	2006-05-25 09:08:23 UTC (rev 3460)
+++ plog/trunk/class/file/unpacker/baseunpacker.class.php	2006-05-25 15:48:14 UTC (rev 3461)
@@ -1,6 +1,13 @@
 <?php
 
-	
+    // default paths where 'tar', 'gzip', 'bzip2', 'unrar', 'unzip' can be found... 
+    // this should be true for at least linux-based machines (this is where they are
+    // located in my gentoo box)
+    define( "DEFAULT_TAR_PATH", "/bin/tar" );
+    define( "DEFAULT_GZIP_PATH", "/bin/gzip" );
+    define( "DEFAULT_BZIP2_PATH", "/bin/bzip2" );
+    define( "DEFAULT_UNRAR_PATH", "/usr/bin/unrar" );
+    define( "DEFAULT_UNZIP_PATH", "/usr/bin/unzip" );	
 
 	/**
 	 * \ingroup File_Unpacker

Modified: plog/trunk/class/file/unpacker/rarunpacker.class.php
===================================================================
--- plog/trunk/class/file/unpacker/rarunpacker.class.php	2006-05-25 09:08:23 UTC (rev 3460)
+++ plog/trunk/class/file/unpacker/rarunpacker.class.php	2006-05-25 15:48:14 UTC (rev 3461)
@@ -1,10 +1,7 @@
 <?php
 
-	
-    include_once( PLOG_CLASS_PATH."class/file/unpacker/baseunpacker.class.php" );    
+    include_once( PLOG_CLASS_PATH."class/file/unpacker/baseunpacker.class.php" );
 
-    define( "DEFAULT_UNRAR_PATH", "/usr/bin/unrar" );
-
 	/**
 	 * \ingroup File_Unpacker
 	 *

Modified: plog/trunk/class/file/unpacker/tarbz2unpacker.class.php
===================================================================
--- plog/trunk/class/file/unpacker/tarbz2unpacker.class.php	2006-05-25 09:08:23 UTC (rev 3460)
+++ plog/trunk/class/file/unpacker/tarbz2unpacker.class.php	2006-05-25 15:48:14 UTC (rev 3461)
@@ -1,15 +1,8 @@
 <?php
 
-	
     include_once( PLOG_CLASS_PATH."class/file/unpacker/baseunpacker.class.php" );
     include_once( PLOG_CLASS_PATH."class/config/config.class.php" );
 
-    // default paths where 'tar' and 'gzip' can be found... this should be true
-    // for at least linux-based machines (this is where they are located in
-    // my gentoo box)
-    define( "DEFAULT_TAR_PATH", "/bin/tar" );
-    define( "DEFAULT_BZIP2_PATH", "/bin/bzip2" );
-
     /**
 	 * \ingroup File_Unpacker
 	 *

Modified: plog/trunk/class/file/unpacker/targzunpacker.class.php
===================================================================
--- plog/trunk/class/file/unpacker/targzunpacker.class.php	2006-05-25 09:08:23 UTC (rev 3460)
+++ plog/trunk/class/file/unpacker/targzunpacker.class.php	2006-05-25 15:48:14 UTC (rev 3461)
@@ -1,15 +1,8 @@
 <?php
 
-	
     include_once( PLOG_CLASS_PATH."class/file/unpacker/baseunpacker.class.php" );
     include_once( PLOG_CLASS_PATH."class/config/config.class.php" );
 
-    // default paths where 'tar' and 'gzip' can be found... this should be true
-    // for at least linux-based machines (this is where they are located in
-    // my gentoo box)
-    define( "DEFAULT_TAR_PATH", "/bin/tar" );
-    define( "DEFAULT_GZIP_PATH", "/bin/gzip" );
-
     /**
 	 * \ingroup File_Unpacker
 	 *

Modified: plog/trunk/class/file/unpacker/zipunpacker.class.php
===================================================================
--- plog/trunk/class/file/unpacker/zipunpacker.class.php	2006-05-25 09:08:23 UTC (rev 3460)
+++ plog/trunk/class/file/unpacker/zipunpacker.class.php	2006-05-25 15:48:14 UTC (rev 3461)
@@ -1,11 +1,8 @@
 <?php
 
-	
     include_once( PLOG_CLASS_PATH."class/file/unpacker/baseunpacker.class.php" );
     include_once( PLOG_CLASS_PATH."class/file/unpacker/pclzip.lib.php" );	
 
-    define( "DEFAULT_UNZIP_PATH", "/usr/bin/unzip" );
-
 	/**
 	 * \ingroup File_Unpacker
 	 *