[Fai-commit] r5525 - in trunk: bin debian

[Thomas Lange]

Author: lange
Date: 2009-09-25 13:00:21 +0000 (Fri, 25 Sep 2009)
New Revision: 5525

Modified:
   trunk/bin/ftar
   trunk/debian/changelog
Log:
ftar: add support for .tgz suffix

Modified: trunk/bin/ftar
===================================================================
--- trunk/bin/ftar	2009-09-25 12:45:05 UTC (rev 5524)
+++ trunk/bin/ftar	2009-09-25 13:00:21 UTC (rev 5525)
@@ -6,7 +6,7 @@
 # ftar -- extract tar files using FAI classes
 #
 # This script is part of FAI (Fully Automatic Installation)
-# Copyright (C) 2001-2008 Thomas Lange, lange at informatik.uni-koeln.de
+# Copyright (C) 2001-2009 Thomas Lange, lange at informatik.uni-koeln.de
 # Universitaet zu Koeln
 #
 #*********************************************************************
@@ -27,7 +27,7 @@
 # 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA
 #*********************************************************************
 
-version="Version 1.6.2, 16-june-2008"
+version="Version 1.7, 25-september-2009"
 
 # - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
 die() {
@@ -52,7 +52,7 @@
     cat <<EOF
 ftar, extract tar files using classes. $version
 
-   Copyright (C) 2001-2008 by Thomas Lange
+   Copyright (C) 2001-2009 by Thomas Lange
 
 Usage: ftar [OPTION] ... SOURCE
 
@@ -127,7 +127,7 @@
 for c in $revclasses ; do
     # what if a directory exists which is equal to the hostname or a classname?
     # [ -f $fpath/$c ]          && extract $fpath/$c cat
-    [ -f $fpath/$c.tgz ]      && die "Suffix .tgz not supported. Use .tar.gz"
+    [ -f $fpath/$c.tgz ]      && extract $fpath/$c.tgz zcat
     [ -f $fpath/$c.tar ]      && extract $fpath/$c.tar cat
     [ -f $fpath/$c.tar.gz ]   && extract $fpath/$c.tar.gz zcat
     [ -f $fpath/$c.tar.bz2 ]  && extract $fpath/$c.tar.bz2 bzcat

Modified: trunk/debian/changelog
===================================================================
--- trunk/debian/changelog	2009-09-25 12:45:05 UTC (rev 5524)
+++ trunk/debian/changelog	2009-09-25 13:00:21 UTC (rev 5525)
@@ -1,4 +1,4 @@
-fai (3.2.23~beta15) unstable; urgency=low
+fai (3.2.23~beta16) unstable; urgency=low
 
   [ Thomas Lange ]
   * subroutines-linux: fix log message
@@ -72,6 +72,7 @@
   * doc/Makefile: new target for asciidoc documentation
   * doc/fai-guide.txt: fai-guide now written with asciidoc
   * fai-doc.doc-base.package: update file names
+  * ftar: add support for .tgz suffix
     
   [ Michael Tautschnig ]
   * setup-storage/Parser.pm: Set the boot flag on partition mounted at /, if
@@ -109,7 +110,7 @@
   [ Holger Levsen ]
   * update to standards version 3.8.2, no changes needed
  
- -- Thomas Lange <lange at debian.org>  Fri, 25 Sep 2009 11:25:53 +0200
+ -- Thomas Lange <lange at debian.org>  Fri, 25 Sep 2009 15:00:00 +0200
 
 fai (3.2.20) unstable; urgency=low