Changeset 37043

Timestamp:

2022-12-20T18:19:41+13:00 (11 months ago)

Author:

davidb

Message:

Tweaks after testing

Location:

gs3-extensions/structured-image/trunk/src

Files:

• INSTALL-MIRADOR.sh (modified) (1 diff)
• NPM-INSTALL-MIRADOR.sh (modified) (1 diff)
• NPM-WEBPACK-MIRADOR.sh (modified) (1 diff)
• UNTAR-MIRADOR-SRC.sh (added)

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

@@ -1 +1 @@
 #!/bin/bash
 
-if [! -d $GSDL3HOME/structured-image/ ] ; then
+if [ ! -d "$GSDL3HOME/ext/structured-image/" ] ; then
     echo ""
     echo "Creating directory:"
-    echo "    $GSDL3HOME/structured-image"
+    echo "    $GSDL3HOME/ext/structured-image"
     echo ""
+    mkdir "$GSDL3HOME/ext/structured-image"
 fi
     
-if [ -d $GSDL3HOME/structured-image/mirador3 ] ; then
+if [ -d "$GSDL3HOME/ext/structured-image/mirador3" ] ; then
     echo ""
     echo "Removing previous installation:"
-    echo "    $GSDL3HOME/structured-image/mirador3"
+    echo "    $GSDL3HOME/ext/structured-image/mirador3"
 
-    /bin/rm -rf $GSDL3HOME/structured-image/mirador3
+    /bin/rm -rf "$GSDL3HOME/ext/structured-image/mirador3"
 fi
 
 echo ""
 echo "Installing webpack JS library for gs-annotations to:"
-echo "    $GSDL3HOME/structured-image/mirador3"
+echo "    $GSDL3HOME/ext/structured-image/mirador3"
 
-mkdir $GSDL3HOME/structured-image/mirador3
+mkdir "$GSDL3HOME/ext/structured-image/mirador3"
 
-cp -r mirador-integration-annotation/webpack/dist-gs-annotations $GSDL3HOME/structured-image/mirador3/dist
+cp -r mirador-integration-annotations-gitfork/webpack/dist-gs-annotations "$GSDL3HOME/ext/structured-image/mirador3/dist"
 
 echo ""

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

@@ -11 +11 @@
     && npm install && cd ..
 
+if [ $? = 0 ] ; then
+    echo ""
+    echo "Now run: "
+    echo "    ./NPM-WEBPACK-MIRADOR.sh"
+    echo ""
+fi
 
 
-
-

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

@@ -7 +7 @@
 
 cd mirador-integration-annotations-gitfork \
-    && npm run webpack-gs-annotations-fitfork && cd ..
+    && npm run webpack-gs-annotations && cd ..
 
 if [ $? = 0 ] ;  then