Changeset 30299 for gs2-extensions

Timestamp:

2015-10-09T17:27:09+13:00 (9 years ago)

Author:

jmt12

Message:

Making the removal of the jar file conditional on it actually being there :P

File:

• gs2-extensions/parallel-building/trunk/src/src/CASCADE-MAKE/HADOOPGREENSTONEINGEST.sh (modified) (1 diff)

gs2-extensions/parallel-building/trunk/src/src/CASCADE-MAKE/HADOOPGREENSTONEINGEST.sh

@@ -10 +10 @@
 prefix=$GEXTPARALLELBUILDING_INSTALLED
 
+library_jar_path="${GEXTPARALLELBUILDING_INSTALLED}/lib/hadoop-greenstone.jar"
+
 # Can't build HadoopGreenstoneIngest without Greenstone
 if [ "${HADOOP_VERSION}x" != "x" ]
 then
-    rm ${GEXTPARALLELBUILDING_INSTALLED}/lib/hadoop-greenstone.jar
+    if [ -f "${library_jar_path}" ]
+    then
+    rm "${library_jar_path}"
+    fi
     pushd ${GEXTPARALLELBUILDING}/src/java/org/nzdl/gsdl/
     rm -rf hgi_classes
     mkdir hgi_classes
     javac -cp $HADOOP_PREFIX/hadoop-core-$HADOOP_VERSION.jar -d hgi_classes *.java
-    jar -cvf $GEXTPARALLELBUILDING_INSTALLED/lib/hadoop-greenstone.jar -C hgi_classes/ .
+    jar -cvf "${library_jar_path}" -C hgi_classes/ .
     popd
 else