[code] final fixes on variable overhaul

Ark74 · Ark74 · commit 4e518927e9cb · 2025-12-13T04:40:39.000-05:00
diff --git a/roles/code/tasks/install.yml b/roles/code/tasks/install.yml
@@ -71,11 +71,6 @@
           }}
       when: code_blocked_by_cdn is undefined
 
-    - name: "Show resolved APK release name"
-      debug:
-        var: code_apk_release_name
-      when: code_blocked_by_cdn is undefined
-
     - name: Extract latest armv7a APK filename from index
       set_fact:
         code_apk_32bit_filename: >-
@@ -89,7 +84,12 @@
 
 - name: Get CodeOnTheGo version number
   set_fact:
-    cotg_version: "{{ code_apk_release_name | regex_search('CodeOnTheGo-release([0-9.]+)', '\\1') }}"
+    cotg_version: "{{ code_apk_64bit_filename | regex_search('CodeOnTheGo-release([0-9.]+)', '\\1') }}"
+  when: code_blocked_by_cdn is undefined
+
+- name: "Show resolved APK release name"
+  debug:
+    var: cotg_version
   when: code_blocked_by_cdn is undefined
 
 - name: Make index.html file
diff --git a/roles/code/tasks/install_apkfile.yml b/roles/code/tasks/install_apkfile.yml
@@ -7,17 +7,17 @@
 ### Current release - arm64 ###
 - name: Download arch arm64 APK
   get_url:
-    url: "{{ code_download_url }}/{{ item.filename }}"
-    dest: "{{ code_data_root_apk }}/{{ item.filename }}"
+    url: "{{ code_download_url }}/{{ code_apk_64bit_filename }}"
+    dest: "{{ code_data_root_apk }}/{{ code_apk_64bit_filename }}"
     mode: "0644"
     timeout: "{{ download_timeout }}"
-  loop: "{{ code_apk_64bit_filename }}"
+  when: code_apk_64bit_filename
 
 ### Future release - arm32 ###
-#- name: Download arch arm32 apk (0644)
+#- name: Download arch arm64 APK
 #  get_url:
-#    url: "{{ code_download_url }}/{{ item.filename }}"
-#    dest: "{{ code_data_root_apk }}/{{ item.filename }}"
+#    url: "{{ code_download_url }}/{{ code_apk_64bit_filename }}"
+#    dest: "{{ code_data_root_apk }}/{{ code_apk_64bit_filename }}"
 #    mode: "0644"
 #    timeout: "{{ download_timeout }}"
-#  loop: "{{ code_apk_32bit_filename }}"
+#  when: code_apk_64bit_filename
