Changeset 35328

Timestamp:

2021-09-02T11:55:47+12:00 (3 years ago)

Author:

davidb

Message:

Changed to get list of located jar files from located-jar-list.txt

File:

• main/trunk/greenstone3/src/jar-support/google-api-client-jars/INSTALL-JAR-DEPENDENCIES.sh (modified) (1 diff)

main/trunk/greenstone3/src/jar-support/google-api-client-jars/INSTALL-JAR-DEPENDENCIES.sh

@@ -1 +1 @@
 #!/bin/bash
-
-
-jar_list=`cat jar-list.txt | egrep -v "^#"`
 
 
 echo ""
 
-src_jar_list=""
+if [ ! -f located-jar-list.txt ] ; then
+    echo "Failed to locate:" >&2
+    echo "  located-jar-list.txt" >&2
+    echo ""
+    echo "Have your run:" >&2
+    echo "  ./LOCATE-JAR.DEPENDENCIES.sh" >&2
+fi
+   
 
-
-# Turns out property files not needed
-#src_prop_list=""
-
-for j in $jar_list ; do
-    num_matches=`find google-*-client -name "*$j" | wc -l`
-
-    if [ $num_matches != "0" ] ; then
-    found_jar_file=`find google-*-client -name "*$j" | head -n 1`
-    src_jar_list="$src_jar_list $found_jar_file"
-
-#   found_prop_file=${found_jar_file%.*}.properties
-#   if [ -f $found_prop_file ] ; then
-#      src_prop_list="$src_prop_list $found_prop_file"
-#   fi
-    else
-    echo "" 1>&2
-    echo "Error, failed to find:" 1>&2
-    echo "  $j" 1>&2
-    echo "" 1>&2
-    exit 1
-    fi
-
-done
-
-
-for sj in $src_jar_list ; do
+echo "Installing: "
+for sj in `cat located-jar-list.txt` ; do
     j=${sj##*/}
     dj=../../../web/WEB-INF/lib/$j
-    echo "Copying: $sj -> $dj"
+    echo "  $sj -> $dj"
     /bin/cp $sj $dj
 done
 
 
-#for sp in $src_prop_list ; do
-#    p=${sp##*/}
-#    dp=../../../web/WEB-INF/lib/$p
-#    echo "Copying: $sp -> $dp"
-#    /bin/cp $sp $dp
-#done
+echo ""