Merge pull request lsc-project#269 from Worteks/master

fix: sample code doesn't run from Debian package
Worteks · May 28, 2024 · dca8b07 · dca8b07
2 parents cba14a0 + a96b953
commit dca8b07
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 2 deletions.
diff --git a/sample/hsqldb/bin/lsc-sample b/sample/hsqldb/bin/lsc-sample
@@ -58,7 +58,9 @@ if [ ${SAMPLE_HOME:0:1} != "/" ] ; then
 fi
 
 # HSQLDB jar file
-HSQLDB_LIB=`ls $SAMPLE_HOME/../../lib/hsqldb*.jar`
+[ -z "$HSQLDB_LIB" -a -e $SAMPLE_HOME/../../lib/hsqldb*.jar ] && HSQLDB_LIB=`ls $SAMPLE_HOME/../../lib/hsqldb*.jar`
+[ -z "$HSQLDB_LIB" -a -e $SAMPLE_HOME/../lib/lsc/hsqldb*.jar ] && HSQLDB_LIB=`ls $SAMPLE_HOME/../lib/lsc/hsqldb*.jar`
+[ -z "$HSQLDB_LIB" ] && echo "hsqldb driver (hsqldb*.jar) is missing" && exit 1
 # Temporary directory so that HSQLDB server could store files
 HSQLDB_DIR=/tmp/lsc/hsqldb
 # HSQLDB configuration file
@@ -243,6 +245,10 @@ run_java_command()
 		LDAPCP="$LDAPCP:$jar"
 	done
 
+	for jar in "$SAMPLE_HOME"/../lib/lsc/*.jar; do
+		LDAPCP="$LDAPCP:$jar"
+	done
+
 	# is this Cygwin? if so, convert path to Windows format for the JVM
 	CYGPATH_COMMAND="$(which cygpath 2>/dev/null)"
 	if [ -e "$CYGPATH_COMMAND" ]; then

diff --git a/sample/ldap2hsqldb/bin/lsc-sample b/sample/ldap2hsqldb/bin/lsc-sample
@@ -58,7 +58,9 @@ if [ ${SAMPLE_HOME:0:1} != "/" ] ; then
 fi
 
 # HSQLDB jar file
-HSQLDB_LIB=`ls $SAMPLE_HOME/../../lib/hsqldb*.jar`
+[ -z "$HSQLDB_LIB" -a -e $SAMPLE_HOME/../../lib/hsqldb*.jar ] && HSQLDB_LIB=`ls $SAMPLE_HOME/../../lib/hsqldb*.jar`
+[ -z "$HSQLDB_LIB" -a -e $SAMPLE_HOME/../lib/lsc/hsqldb*.jar ] && HSQLDB_LIB=`ls $SAMPLE_HOME/../lib/lsc/hsqldb*.jar`
+[ -z "$HSQLDB_LIB" ] && echo "hsqldb driver (hsqldb*.jar) is missing" && exit 1
 # Temporary directory so that HSQLDB server could store files
 HSQLDB_DIR=/tmp/lsc/hsqldb
 # HSQLDB configuration file
@@ -182,6 +184,10 @@ run_java_command()
 		LDAPCP="$LDAPCP:$jar"
 	done
 
+	for jar in "$SAMPLE_HOME"/../lib/lsc/*.jar; do
+		LDAPCP="$LDAPCP:$jar"
+	done
+
 	# is this Cygwin? if so, convert path to Windows format for the JVM
 	CYGPATH_COMMAND="$(which cygpath 2>/dev/null)"
 	if [ -e "$CYGPATH_COMMAND" ]; then