Changeset 38528 for main/trunk/greenstone3

Timestamp:

2024-01-12T13:20:21+13:00 (5 months ago)

Author:

davidb

Message:

Script improvements/tidy-up

File:

• main/trunk/greenstone3/src/ansible-playbooks/greenstone3-svn-playbook.yml (modified) (5 diffs)

main/trunk/greenstone3/src/ansible-playbooks/greenstone3-svn-playbook.yml

@@ -34 +34 @@
     - name: Setting gsdl3srchome
       set_fact: gsdl3srchome="{{ gsdl3srchome }}"
-    - debug: msg="{{ hostvars['localhost']['gsdl3srchome'] }}"
+    - debug: msg="gsdl3srchome = {{ hostvars['localhost']['gsdl3srchome'] }}"
     
     - name: Setting gsdl3port
       set_fact: gsdl3port="{{ gsdl3port }}"
-    - debug: msg="{{ hostvars['localhost']['gsdl3port'] }}"
+    - debug: msg="gsdl3port = {{ hostvars['localhost']['gsdl3port'] }}"
     
 
@@ -91 +91 @@
       dest: "{{ gsdl3srchome }}"
 
-  - name: Downloading and unpacking self-contained command-line tools for Greenstone3 (JDK, Apache Ant)
+  - name: Downloading and unpacking self-contained command-line tools for Greenstone3
     ansible.builtin.shell:
       chdir:     "{{ gsdl3srchome }}/ext-cli"
-      cmd:       "./get-selfcontained-jdk.sh && ./get-selfcontained-ant.sh"
+      # cmd:       "./get-selfcontained-jdk.sh && ./get-selfcontained-ant.sh"
+      cmd:       "./get-selfcontained-{{ item }}.sh"
+    register:  result
+    changed_when:
+      - '"Untarred" in result.stdout'      
+    with_items:
+      - jdk
+      - ant
 
   # The next two steps are equivalent to sourcing SETUP.bash
@@ -100 +107 @@
   #   https://stackoverflow.com/questions/60209185/ansible-environment-variables-from-env-file
   #
+  - name: Source Greenstone3's SETUP.bash
+    ansible.builtin.shell:
+      executable: /bin/bash
+      chdir:      "{{ gsdl3srchome }}"      
+      cmd:        . ./SETUP.bash 1>/dev/null 2>&1 && env
+    register:   env_file_result
+
 #  - name: Source Greenstone3's SETUP.bash  using newer ./SETUP-ENV.sh (Ultimately new appoach not needed)
 #    ansible.builtin.command: ./SETUP-ENV.sh
@@ -113 +127 @@
 #    register:   env_file_result
 
-  - name: Source Greenstone3's SETUP.bash
-    ansible.builtin.shell:
-      executable: /bin/bash
-      chdir:      "{{ gsdl3srchome }}"      
-      cmd:        . ./SETUP.bash 1>/dev/null 2>&1 && env
-    register:   env_file_result
 
-#  - debug: var=env_file_result.stdout_lines
+#    #- debug: var=env_file_result.stdout_lines
 
   - name: Parse Greenstone3 environment variables
@@ -130 +138 @@
 #    environment: "{{ env_vars }}"
 
-#  - debug: var=env_vars
+   #- debug: var=env_vars