Changeset 38215

Timestamp:

2023-09-25T22:53:50+13:00 (8 months ago)

Author:

davidb

Message:

Rewritten to avoid the fact that 'diff' generates a non-zero return status, because the patch and original files are different

File:

• gs3-extensions/structured-image/trunk/src/NPM-INSTALL-MIRADOR.sh (modified) (1 diff)

gs3-extensions/structured-image/trunk/src/NPM-INSTALL-MIRADOR.sh

@@ -17 +17 @@
     echo "* Patching mirador-annotations/es/SimpleAnnotationServerV2Adapter.js"
     echo "****"
-    
-    cd mirador-integration-annotations-gitfork \
-    && echo "--------" \
-    && diff PATCHED-es-SimpleAnnotationServerV2Adapter.js node_modules/mirador-annotations/es/SimpleAnnotationServerV2Adapter.js \
-    && /bin/cp PATCHED-es-SimpleAnnotationServerV2Adapter.js node_modules/mirador-annotations/es/SimpleAnnotationServerV2Adapter.js \
-    && echo "--------" \
-    && echo "" \
-    && cd ..
 
+    echo "--------"
+    diff mirador-integration-annotations-gitfork/PATCHED-es-SimpleAnnotationServerV2Adapter.js \
+     mirador-integration-annotations-gitfork/node_modules/mirador-annotations/es/SimpleAnnotationServerV2Adapter.js
+    echo "--------" 
+    echo ""
+
+    /bin/cp mirador-integration-annotations-gitfork/PATCHED-es-SimpleAnnotationServerV2Adapter.js \
+        mirador-integration-annotations-gitfork/node_modules/mirador-annotations/es/SimpleAnnotationServerV2Adapter.js
 
     if [ $? = 0 ] ; then