UnixPB: Override Default Pandoc Install Root For MacOS x64 (#4148)

Author: steelhead31

ansible/playbooks/AdoptOpenJDK_Unix_Playbook/roles/pandoc/tasks/main.yml

@@ -53,7 +53,7 @@
     - name: Override install root on macOS x64
       when:
         - supported
-        - ansible_system == "Darwin"
+        - ansible_facts['system'] == "Darwin"
         - arch_normalized == "amd64"
       set_fact:
         pandoc_install_root: "/usr/local"
@@ -73,7 +73,7 @@
       set_fact:
         archive_path: "{{ download_dir }}/{{ archive_name }}"
         bin_path: "{{ install_dir }}/bin/pandoc"
-        mac_inner: "{{ install_dir }}/pandoc-{{ pandoc_version }}-{{ arch_normalized }}"
+        mac_inner: "{{ install_dir }}/pandoc-{{ pandoc_version }}-{{ ansible_facts['architecture'] }}"
       changed_when: false
       tags: pandoc
 
@@ -127,7 +127,7 @@
       when:
         - supported
         - need_install
-        - ansible_system == "Darwin"
+        - ansible_facts['system'] == "Darwin"
       become: true
       unarchive:
         src: "{{ archive_path }}"
@@ -140,7 +140,7 @@
       when:
         - supported
         - need_install
-        - ansible_system == "Linux"
+        - ansible_facts['system'] == "Linux"
       become: true
       unarchive:
         src: "{{ archive_path }}"
@@ -155,29 +155,25 @@
       when:
         - supported
         - need_install
-        - ansible_system == "Darwin"
+        - ansible_facts['system'] == "Darwin"
       become: true
       file:
         src: "{{ mac_inner }}/bin"
         dest: "{{ install_dir }}/bin"
         state: link
         force: true
-        follow: false
-      tags: pandoc
 
     - name: Ensure macOS share symlink exists (share -> mac_inner/share)
       when:
         - supported
         - need_install
-        - ansible_system == "Darwin"
+        - ansible_facts['system'] == "Darwin"
       become: true
       file:
         src: "{{ mac_inner }}/share"
         dest: "{{ install_dir }}/share"
         state: link
         force: true
-        follow: false
-      tags: pandoc
 
     # Configure & Verify Symlink To Pandoc
     # -------------------------------------------------------