Changeset 37296

Timestamp:

2023-02-07T23:36:58+13:00 (15 months ago)

Author:

davidb

Message:

Updated install scripting

Location:

gs2-extensions/apache-jena/trunk/src

Files:

• CREATE-GREENSTONE-DATASET.sh (added)
• INSTALL-FUSEKI3-WAR.sh (modified) (3 diffs)

gs2-extensions/apache-jena/trunk/src/INSTALL-FUSEKI3-WAR.sh

@@ -11 +11 @@
 fi
 
-if [ ! -f run3/shiro.ini ] || [ src3/run--shiro.ini -nt run3/shiro.ini ] ; then
-    echo "Copying customized runtime shiro authentication file:"
-    echo "  src3/run--shiro.ini -> run3/shiro.ini"
-    /bin/cp src3/run--shiro.ini run3/shiro.ini
+if [ ! -f run3/config.ttl ] || [ run3.in/config.ttl -nt run3/config.ttl ] ; then
+    echo "Copying config.ttl"
+    echo "  run3.in/config.ttl -> run3/config.ttl"
+    /bin/cp run3.in/config.ttl run3/config.ttl
 fi
 
-if [ ! -f run3/templates/config-tdb-dir ] || [ src3/run-templates--config-tdb-dir -nt run3/templates/config-tdb-dir ] ; then
-    echo "Copying customized TDB config file (allowing unionDefaultGraph):"
-    echo "    src3/run-templates--config-tdb-dir run3/templates/config-tdb-dir"
+if [ ! -d run3/templates ] ; then
+    echo "Copying templates dir (customised setting unionDefaultGraph to true):"
+    echo "    run3.in/templates/* run3/templates/."
     if [ ! -d run3/templates ] ; then
     mkdir run3/templates
     fi
-    /bin/cp src3/run-templates--config-tdb-dir run3/templates/config-tdb-dir
+    /bin/cp run3.in/templates/* run3/templates/.
+fi
+
+
+for full_f in run3.in/templates/* ; do
+    f=${full_f##*/}
+
+    if [ run3.in/templates/$f -nt run3/templates/$f ] ; then
+    echo "Updating tempaltes config file"
+    echo "    run3.in/templates/$f run3/templates/$f"
+    /bin/cp run3.in/templates/$f run3/templates/$f
+    fi
+done
+
+if [ ! -f run3/shiro.ini ] || [ run3.in/shiro.ini -nt run3/shiro.ini ] ; then
+    echo "Copying customized runtime shiro authentication file:"
+    echo "  run3.in/shiro.ini -> run3/shiro.ini"
+    /bin/cp run3.in/shiro.ini run3/shiro.ini
 fi
 
@@ -38 +55 @@
        || [ "$FUSEKI_HOME/fuseki.war" -nt "$GSDL3SRCHOME/packages/tomcat/webapps/fuseki3.war" ] ; then
 
+    echo ""
     echo "Copying: "
     echo "    $FUSEKI_HOME/fuseki.war"
@@ -44 +62 @@
     /bin/cp "$FUSEKI_HOME/fuseki.war" "$GSDL3SRCHOME/packages/tomcat/webapps/fuseki3.war"
 else
+    echo ""
     echo "Installed war file is up to date"
 fi
 
-echo ""
-echo "Testing to see if /greenstone dataset exists already (ping)"
-gs-triplestore-dataset-ping3 /greenstone
-
-if [ $? != 0 ] ; then
-    # Did not find dataset
-    echo "" >&2
-    echo "Warning: Did not find Fuseki dataset /greenstone" >&2
-    echo "Could be the dataset doesn't exist, or because the server isn't running" >&2
-    echo "" >&2
-
-    echo -n "Do you want to create /greenstone? [y/n]: "
-    read create_dataset
-
-    if [ "x$create_dataset" != "x" ] ; then
-    if [ "$create_dataset" = "y" ] ||  [ "$create_dataset" = "Y" ] ; then
-        #echo "Run the following:"
-        #echo "    " gs-triplestore-dataset-create3 /greenstone
-        echo "Creating the /greenstone dataset"
-        gs-triplestore-dataset-create3 /greenstone
-    fi
-    fi
-    
-fi
 
 echo ""
 
+echo "****"
+echo "* If this is the first time you've install fuseki3.war, now run:"
+echo "*     ./CREATE-GREENSTONE-DATASET.sh"
+echo "****"
+echo ""
+