[Sqlshell-svn] /devel//

[SVN by r. <sv...@ca...>]

Author: rotman
Date: 2007-10-08 15:46:58 +0200 (Mon, 08 Oct 2007)
New Revision: 167

Modified:
   makejars.sh
   sqlshell
Log:
Use sane defaults


Modified: makejars.sh
===================================================================
--- makejars.sh	2007-10-08 12:16:13 UTC (rev 166)
+++ makejars.sh	2007-10-08 13:46:58 UTC (rev 167)
@@ -1,18 +1,23 @@
 #!/bin/bash
+PROJECT=sqlshell
 VERSION=0.2
+
+#cleanup
 rm -Rf release
 mkdir release
 cd release
+
 #create source files
 mkdir source
 cp -Rf ../src source
 cp ../pom.xml source
 cp ../README source
-cp ../sqlshell source
+cp ../${PROJECT} source
 cd source
-rm -Rf `find . -name *.svn`
-tar zcf ../sqlshell-src-$VERSION.tgz .
-zip -r ../sqlshell-src-$VERSION.zip .
+rm -Rf src/www
+find . -name "*.svn" | xargs rm -Rf
+tar zcf ../${PROJECT}-src-${VERSION}.tgz .
+zip -r ../${PROJECT}-src-${VERSION}.zip .
 cd ..
 rm -Rf source
 
@@ -21,19 +26,23 @@
 mvn clean package
 cd release
 mkdir bin
-cp ../sqlshell bin
+cp ../${PROJECT} bin
 cp ../README bin
 cp ../src/main/resources/db.properties bin
-cp ../target/*.jar bin/sqlclient.jar
+cp ../target/*.jar bin/${PROJECT}.jar
 cp -Rf ../lib bin
 cp -Rf ${HOME}/.m2/repository/hsqldb/hsqldb/1.8.0/hsqldb-1.8.0.jar bin/lib
 mkdir bin/db
 cp -Rf ../db/*.script bin/db
 cp -Rf ../db/*.properties bin/db
 cd bin
-rm -Rf `find . -name *.svn`
-tar zcf ../sqlshell-bin-$VERSION.tgz .
-zip -r ../sqlshell-bin-$VERSION.zip .
+find . -name "*.svn" | xargs rm -Rf
+mv sqlshell _sqlshell
+cat _sqlshell | awk '{ gsub("SQLSHELL=","#SQLSHELL="); gsub("##SQLSHELL=","SQLSHELL="); print }' > sqlshell
+chmod +x sqlshell
+rm _sqlshell
+tar zcf ../${PROJECT}-bin-${VERSION}.tgz .
+zip -r ../${PROJECT}-bin-${VERSION}.zip .
 cd ..
 rm -Rf bin
 cd ..

Modified: sqlshell
===================================================================
--- sqlshell	2007-10-08 12:16:13 UTC (rev 166)
+++ sqlshell	2007-10-08 13:46:58 UTC (rev 167)
@@ -15,28 +15,22 @@
 #   limitations under the License.
 
 # Path to java executable
+#JAVA=$(which java)
 JAVA=${JAVA_HOME}/bin/java
-#JAVA=`which java`
 
 # Dir to use as base for relative locations
-#WORKINGDIR=`pwd`
-WORKINGDIR=`pwd`
+WORKINGDIR=$(pwd)
 
 # The directory where the JCurses jar and library are located.
 # Please note that JCurses requires tje jcurses.jar and libjcurses.so to
 # be located in the same directory.
-#JCURSES=${WORKINGDIR}/lib/
 JCURSES=${WORKINGDIR}/lib
 
 # Where to find the SQLShell classes
-#SQLSHELL=${WORKINGDIR}/sqlclient-0.1-SNAPSHOT.jar
-#SQLSHELL=target/classes
-SQLSHELL=sqlclient.jar
+#SQLSHELL=${WORKINGDIR}/sqlshell.jar
+SQLSHELL=target/classes
 
 # Jars providing drivers for the databases to support.
-#DRIVERS="${HOME}/.m2/repository/hsqldb/hsqldb/1.8.0/hsqldb-1.8.0.jar
-#${HOME}/.m2/repository/db/oracle/1.4/oracle-1.4.jar"
-
 DRIVERS="${WORKINGDIR}/lib/hsqldb-1.8.0.jar"
 
 # The classpath to use when running