[Firebird-checkins] CVS: OdbcJdbc/Install/Linux install.sh,1.1,1.2 readme.txt,1.1,1.2

[Paul R. <pau...@us...>]

Update of /cvsroot/firebird/OdbcJdbc/Install/Linux
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv5132/OdbcJdbc/Install/Linux

Modified Files:
	install.sh readme.txt 
Log Message:
Update Linux install kit for v1.2. Increment build number.

Index: install.sh
===================================================================
RCS file: /cvsroot/firebird/OdbcJdbc/Install/Linux/install.sh,v
retrieving revision 1.1
retrieving revision 1.2
diff -b -U3 -r1.1 -r1.2
--- install.sh	10 Jul 2004 05:17:05 -0000	1.1
+++ install.sh	5 Aug 2004 07:41:16 -0000	1.2
@@ -12,15 +12,14 @@
 #    language governing rights and limitations under the License.
 #
 #
-#    The Original Code was created by Paul Reeves for IBPhoenix.
-#
 #    Copyright (c) 2004 Paul Reeves
 #    All Rights Reserved.
 #
-# To Do for future version
+# To Do for a future version
 #    Consider adding an install log
 #    Make verbose output consistent
 #    Consider adding --force for those that really don't care.
+#    Consider adding a --status option - Does unixODBC exist. Is the driver already installed?
 #
 #   Test the install
 #   Write uninstall docs function
@@ -91,8 +90,8 @@
             echo "    --docs=/path/to/docs/on/your/distribution"
             echo "  as a parameter.    "
             echo ""
-            echo "  The Firebird documentation will be created in a "
-            echo "  sub-directory under the directory specified."
+            echo "  The Firebird ODBC Driver documentation will be created "
+            echo "  in a sub-directory under the directory specified."
             ;;
         7)
             echo "  A problem occurred while running odbcinst to "
@@ -166,7 +165,7 @@
     #If it isn't we will have a problem registering
     #the driver as the odbcinst.ini is distro specific.
     #So, might as well bail out now if we can't find odbcinst.
-    odbcinst 1>/dev/null 2>/dev/null
+    odbcinst 2>/dev/null >/dev/null 
     if [ $? -eq 127 ]; then ErrorHelp 9; fi
 
     #Which Distro is installed?
@@ -213,12 +212,13 @@
 InstallLibraries()
 {
     if [ "$TEST" = "1" ]; then
-        echo "Testing decompression of tarfile OdbcJdbcLibs.tar.gz"
-        tar --directory $fbODBCLIBS -tvzf OdbcJdbcLibs.tar.gz
+        echo "Testing extraction of tarfile OdbcJdbcLibs.tar"
+        tar --directory $fbODBCLIBS -tvf OdbcJdbcLibs.tar
     else
-        echo "Decompressing OdbcJdbcLibs.tar.gz"
-        tar --directory $fbODBCLIBS -xvzf OdbcJdbcLibs.tar.gz
+        echo "Untarring OdbcJdbcLibs.tar"
+        tar --directory $fbODBCLIBS -xvf OdbcJdbcLibs.tar
         ln -f -s $fbODBCLIBS/libIscDbc.so $fbODBCLIBS/libIscDbc
+        ln -f -s $fbODBCLIBS/libIscDbc.so $fbODBCLIBS/IscDbc
     fi
 
     if [ $? -ne 0 ]; then
@@ -226,45 +226,38 @@
     fi
 }
 
+
 ##################################################################################
 UninstallLibraries()
 {
+    if [ "TEST" = "1" ]; then
     echo $FUNCNAME
-    if [ "$VERBOSE" = "1" ]; then
-        echo "Attempting to uninstall the driver"
     fi
 
-    if [ "TEST" = "1" ]; then
         for afile in libIscDbc.so libOdbcJdbc.so libOdbcJdbcS.so libIscDbc
         do
+        if [ "TEST" = "1" ]; then
             echo "In Test Mode. Would remove $(fbODBCLIBS)/$afile"
-        done
     else
-        for file in libIscDbc.so libOdbcJdbc.so libOdbcJdbcS.so libIscDbc
-        do
             rm $fbODBCLIBS/$afile
-        done
     fi
+    done
 }
 
 ##################################################################################
 UninstallDocs()
 {
+    if [ "$TEST" = "1" ]; then
     echo $FUNCNAME
-    if [ "$VERBOSE" = "1" ]; then
-        echo "Attempting to uninstall the documentation"
     fi
+
     if [ "TEST" = "1" ]; then
-        for afile in libIscDbc.so libOdbcJdbc.so libOdbcJdbcS.so libIscDbc
-        do
-            echo "In Test Mode. Would remove $afile"
-        done
+        echo "In Test Mode. Would remove  $fbODBCDOCS/*"
     else
-        for afile in libIscDbc.so libOdbcJdbc.so libOdbcJdbcS.so libIscDbc
-        do
-        Inclomplete!
-            rm $(fbODBCLIBS)/$afile
-        done
+        rm $fbODBCDOCS/html/*
+		rmdir $fbODBCDOCS/html
+        rm $fbODBCDOCS/*
+		rmdir $fbODBCDOCS
     fi
 }
 
@@ -281,19 +274,20 @@
         echo "Would copy $afile to $fbODBCDOCS"
     done
 
-    echo "Testing decompression of tarfile OdbcJdbcDocs.tar.gz"
-    tar --directory $fbODBCDOCS -tvzf OdbcJdbcDocs.tar.gz
+    echo "Testing extraction of tarfile OdbcJdbcDocs.tar"
+    tar --directory $fbODBCDOCS -tvf OdbcJdbcDocs.tar
 else
+    if [ ! -d $fbODBCDOCS  ]; then
+        mkdir $fbODBCDOCS
+    fi
+
     for afile in readme.txt *.ini
     do
         cp $afile $fbODBCDOCS
     done
 
-    if [ ! -d $fbODBCDOCS  ]; then
-        mkdir $fbODBCDOCS
-    fi
-    echo "Decompressing OdbcJdbcDocs.tar.gz"
-    tar --directory $fbODBCDOCS -xvzf OdbcJdbcDocs.tar.gz
+    echo "Untarring OdbcJdbcDocs.tar.gz"
+    tar --directory $fbODBCDOCS -xvf OdbcJdbcDocs.tar
 fi
 
 if [ $? -ne 0 ]; then
@@ -311,11 +305,11 @@
     echo "Test Mode. This is the uninstall script that would be created"
     echo "in $fbODBCDOCS : "
     echo "  #!/bin/bash"
-    echo "  install.sh --uninstall --libs=$fbODBCLIBS --docs=$fbODBCDOCS"
+    echo "  ./install.sh --uninstall --libs=$fbODBCLIBS --docs=$fbODBCDOCS"
     echo ""
 else
     echo "#!/bin/bash" > $fbODBCDOCS/uninstall.sh
-    echo "install.sh --uninstall --libs=$fbODBCLIBS --docs=$fbODBCDOCS" >> $fbODBCDOCS/uninstall.sh
+    echo "./install.sh --uninstall --libs=$fbODBCLIBS --docs=$fbODBCDOCS" >> $fbODBCDOCS/uninstall.sh
     echo "" >> $fbODBCDOCS/uninstall.sh
     chmod 744 $fbODBCDOCS/uninstall.sh
 fi
@@ -336,6 +330,7 @@
 fi
 }
 
+
 ##################################################################################
 RemoveDriver()
 {
@@ -351,7 +346,7 @@
 
 
 ##################################################################################
-ConfigureTestDSN()
+CreateTestDSN()
 {
 
 if [ "$TEST" = "1" ]; then
@@ -399,8 +394,20 @@
         WriteUninstallScript
         ConfigureDriver
         if [ "$TESTDSN" = "1" ]; then
-            ConfigureTestDSN
+            CreateTestDSN
         fi
+		echo -e \
+"\n   Installation complete. \n\n \
+  It is recommended that you review the readme.txt, \n \
+  the release notes and the documentation in the \n \
+  html sub-directory. These have been installed \n \
+  in $fbODBCDOCS"
+		echo ""
+
+		echo -e \
+"Installation complete. \n\nIt is recommended that you review the readme.txt, \
+the release notes and the documentation in the html sub-directory. These have been installed \
+in $fbODBCDOCS.\n\n\nThe Firebird ODBC driver development team" | mail -s "Firebird ODBC Driver Installation" $USER@localhost
     fi
 }
 

Index: readme.txt
===================================================================
RCS file: /cvsroot/firebird/OdbcJdbc/Install/Linux/readme.txt,v
retrieving revision 1.1
retrieving revision 1.2
diff -b -U3 -r1.1 -r1.2
--- readme.txt	10 Jul 2004 05:17:05 -0000	1.1
+++ readme.txt	5 Aug 2004 07:41:16 -0000	1.2
@@ -37,6 +37,15 @@
 dsn by passing the parameter --createTestDSN to install.sh.
 
 
+Documentation
+-------------
+
+Be sure to read the release notes. They are available in the 
+FirebirdODBC directory in the standard documentation location
+for your distribution. You will also find detailed information 
+in the html sub-dir.
+
+
 Known issues
 ------------