[Fai-commit] r5528 - in trunk: bin debian lib

[Thomas Lange]

Author: lange
Date: 2009-10-09 09:12:58 +0000 (Fri, 09 Oct 2009)
New Revision: 5528

Modified:
   trunk/bin/fai-do-scripts
   trunk/debian/changelog
   trunk/lib/get-config-dir-cvs
Log:
get-config-dir-cvs, fai-do-scripts: replace basename and dirname calls
with bash functions

Modified: trunk/bin/fai-do-scripts
===================================================================
--- trunk/bin/fai-do-scripts	2009-09-28 08:40:40 UTC (rev 5527)
+++ trunk/bin/fai-do-scripts	2009-10-09 09:12:58 UTC (rev 5528)
@@ -26,7 +26,7 @@
 # 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA
 #*********************************************************************
 
-version="version 1.6.4, 15-apr-2009"
+version="version 1.6.5, 9-oct-2009"
 
 # variables needed: $classes, $cfclasses, $LOGDIR
 # 
@@ -92,7 +92,7 @@
 	*.dpkg-inst) [ X$debug = X1 ] && echo "Skipping file $file"; return ;;
     esac
 
-    name=$(basename $file)
+    name=${file##*/}  % basename function
     case $name in
 	S[0-9][0-9]*) echo -e "WARNING: The script $name does not match [0-9][0-9]*.\nIt's not executed. Please rename it."; return ;;
     esac

Modified: trunk/debian/changelog
===================================================================
--- trunk/debian/changelog	2009-09-28 08:40:40 UTC (rev 5527)
+++ trunk/debian/changelog	2009-10-09 09:12:58 UTC (rev 5528)
@@ -1,4 +1,4 @@
-fai (3.2.23~beta17) unstable; urgency=low
+fai (3.2.23~beta18) unstable; urgency=low
 
   [ Thomas Lange ]
   * subroutines-linux: fix log message
@@ -75,6 +75,8 @@
   * ftar: add support for .tgz suffix
   * get-config-dir-hg: add support for mercurial (thanks to Darshaka
     Pathirana for the patch)
+  * get-config-dir-cvs, fai-do-scripts: replace basename and dirname calls
+    with bash functions
     
   [ Michael Tautschnig ]
   * setup-storage/Parser.pm: Set the boot flag on partition mounted at /, if
@@ -112,7 +114,7 @@
   [ Holger Levsen ]
   * update to standards version 3.8.2, no changes needed
  
- -- Thomas Lange <lange at debian.org>  Mon, 28 Sep 2009 10:40:12 +0200
+ -- Thomas Lange <lange at debian.org>  Fri, 09 Oct 2009 11:12:29 +0200
 
 fai (3.2.20) unstable; urgency=low
 

Modified: trunk/lib/get-config-dir-cvs
===================================================================
--- trunk/lib/get-config-dir-cvs	2009-09-28 08:40:40 UTC (rev 5527)
+++ trunk/lib/get-config-dir-cvs	2009-10-09 09:12:58 UTC (rev 5528)
@@ -39,8 +39,7 @@
    task_error 701 $?
 else 
    echo "Checking out CVS"
-   cd $(dirname "$FAI")
-   cvs -q co -P -d $(basename "$FAI") \
-     $tag $module > $LOGDIR/getconf.log
+   cd ${FAI%/*}     % cd to dirname $FAI
+   cvs -q co -P -d ${FAI##*/} $tag $module > $LOGDIR/getconf.log   % -d uses basename of $FAI
    task_error 702 $?
 fi