Changeset 37684 for main

Timestamp:

2023-04-20T09:47:22+12:00 (12 months ago)

Author:

davidb

Message:

stop version brought in to line with start version

Location:

main/trunk/greenstone3

Files:

• ant-restart-with-exts.sh (modified) (1 diff)
• ant-start-with-exts.sh (modified) (2 diffs)
• ant-stop-with-exts.sh (modified) (1 diff)

main/trunk/greenstone3/ant-restart-with-exts.sh

@@ -4 +4 @@
 # in companion "ANT-*CUSTOM.sh" scripts
 
-./ANT-STOP-CUSTOM.sh && ./ANT-START-CUSTOM.sh
+./ant-stop-with-exts.sh && ./ant-start-with-exts.sh
 
 

main/trunk/greenstone3/ant-start-with-exts.sh

@@ -12 +12 @@
     if [ -d ext  ] ; then
     for gsdl_ext in ext/* ; do
+        # Sourcing first for settings, then run ext's 'start' script if it exists
         if [ -d $gsdl_ext ] ; then
-        if [ -f $gsdl_ext/ant-start-settings.bash ]; then 
-            cd $gsdl_ext > /dev/null
+        cd $gsdl_ext > /dev/null
+        if [ -f ant-start-settings.bash ]; then 
             . ./ant-start-settings.bash 
-            cd ../..
         fi 
-
+        if [ -f ant-start.sh ]; then 
+            ./ant-start.sh 
+        fi 
+        cd ../..
         fi
     done
@@ -26 +29 @@
     if [ -d gs2build/ext  ] ; then
     for gsdl_ext in gs2build/ext/* ; do
+        # Sourcing first for settings, then run ext's 'start' script if it exists
         if [ -d $gsdl_ext ] ; then 
-        if [ -f $gsdl_ext/ant-start-settings.bash ]; then 
-            cd $gsdl_ext > /dev/null
+        cd $gsdl_ext > /dev/null
+        if [ -f ant-start-settings.bash ]; then 
             . ./ant-start-settings.bash 
-            cd ../../..
         fi 
+        if [ -f ant-start.sh ]; then 
+            ./ant-start.sh 
+        fi 
+        cd ../../..
         fi
     done

main/trunk/greenstone3/ant-stop-with-exts.sh

@@ -1 +1 @@
 #!/bin/bash 
 
-# Add any customized code needed here, such as environemnt variables
 
 
+if test "x$gsopt_noexts" != "x1" ; then
+
+    echo ""
+    echo "----"
+    echo "Checking for custom ant-stop extension settings (ant-stop.sh)"
+    echo "----"
+
+    # Check Greenstone3 extensions
+    if [ -d ext  ] ; then
+    for gsdl_ext in ext/* ; do
+        # Run ext's 'stop' script if it exists,
+        # Then source ant-stop-settings.bash in case there are any variables
+        # the script wants to unset/restore to previous value
+        if [ -d $gsdl_ext ] ; then
+        cd $gsdl_ext > /dev/null
+        if [ -f ant-stop.sh ]; then 
+            ./ant-stop.sh 
+        fi 
+        if [ -f ant-stop-settings.bash ]; then 
+            . ./ant-stop-settings.sh 
+        fi 
+        cd ../..
+            
+        fi
+    done
+    fi
+
+    # Check Greenstone2 extensions
+    if [ -d gs2build/ext  ] ; then
+    for gsdl_ext in gs2build/ext/* ; do
+        # Run ext's 'stop' script if it exists,
+        # Then source ant-stop-settings.bash in case there are any variables
+        # the script wants to unset/restore to previous value       
+        if [ -d $gsdl_ext ] ; then 
+        cd $gsdl_ext > /dev/null
+        if [ -f ant-stop.sh ]; then 
+            ./ant-stop.sh 
+        fi 
+        if [ -f ant-stop-settings.bash ]; then 
+            . ./ant-stop-settings.bash 
+        fi 
+        cd ../../..
+        fi
+    done
+    fi    
+fi
+
+
+# If needed, add any further customized code needed here, such as
+# environemnt variables
+
 ant stop 
+
+# Any customized clean up needed?