[Sblim-commit] sfcb configure.ac,1.8,1.9 getSchema.sh.pre.in,1.4,1.5

[Viktor M. <mih...@us...>]

Update of /cvsroot/sblim/sfcb
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv25228

Modified Files:
	configure.ac getSchema.sh.pre.in 
Log Message:
Bug 1187619: added -f option for getSchema.sh.
Bug 1186414: changed package name to sblim-sfcb.


Index: configure.ac
===================================================================
RCS file: /cvsroot/sblim/sfcb/configure.ac,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -d -r1.8 -r1.9
--- configure.ac	20 Apr 2005 17:00:27 -0000	1.8
+++ configure.ac	26 Apr 2005 13:23:55 -0000	1.9
@@ -21,7 +21,7 @@
 
 # Process this file with autoconf to produce a configure script.
 
-AC_INIT(Small Footprint CIM Broker, 0.8.7a, sc...@de..., sfcb)
+AC_INIT(Small Footprint CIM Broker, 0.8.8, sc...@de..., sblim-sfcb)
 AC_CONFIG_SRCDIR([providerDrv.c])
 
 AM_INIT_AUTOMAKE

Index: getSchema.sh.pre.in
===================================================================
RCS file: /cvsroot/sblim/sfcb/getSchema.sh.pre.in,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- getSchema.sh.pre.in	1 Apr 2005 15:19:29 -0000	1.4
+++ getSchema.sh.pre.in	26 Apr 2005 13:23:55 -0000	1.5
@@ -3,20 +3,56 @@
 
 trap "rm -f /tmp/cimv290.zip" exit 
 
-if test $# == 1; then
+function usage()
+{
+    echo usage: $1 [schemadir] >&2
+}
+
+args=`getopt f $*`
+
+if [ $? != 0 ]
+then
+    usage $0
+    exit 1
+fi
+
+set -- $args
+
+force=0
+while [ -n "$1" ]
+do
+  case $1 in
+      -f) force=1
+	  shift;;
+      --) shift;
+	  break;;
+  esac
+done
+
+if [ $# == 1 ]; then
     sfcbdir=$1
-elif test $# == 0; then
+elif [ $# == 0 ]; then
     sfcbdir=@datadir@/sfcb
 else
-    echo usage: $0 [schemadir]
+    usage $0
+    exit 1
 fi
 
 if [ -x /usr/bin/curl ] 
 then
-   if [ ! -f $sfcbdir/CIM/CIM_Schema.mof ]
+   if [ ! -f $sfcbdir/CIM/CIM_Schema.mof ] || [ $force == 1 ]
    then
       echo "Fetching CIM Schema from DMTF homepage ..."
-      [ -d $sfcbdir/CIM ] || mkdir -p $sfcbdir/CIM
+      if [ -d $sfcbdir/CIM ]
+      then
+	  rm -rf $sfcbdir/CIM
+	  if [ $? != 0 ]
+	  then
+	      echo "Failed to delete schema directory $sfcbdir/CIM" >&2
+	      exit 1
+	  fi
+      fi
+      mkdir -p $sfcbdir/CIM
       if [ $? == 0 ]; then
 	  /usr/bin/curl -o /tmp/cimv290.zip \
  http://www.dmtf.org/standards/cim/cim_schema_v29/CIM_V2.9.0Final-MOFs.zip &&