diff --git a/roles/pfsense_upgrade/tasks/update_check.yml b/roles/pfsense_upgrade/tasks/update_check.yml index 7d1d72a..1c88710 100644 --- a/roles/pfsense_upgrade/tasks/update_check.yml +++ b/roles/pfsense_upgrade/tasks/update_check.yml @@ -8,7 +8,7 @@ # --------------------------------------------------------------------------- - name: List available pfSense repositories ansible.builtin.raw: | - /bin/sh -c 'php -r "require_once(\"/etc/inc/pkg-utils.inc\"); \$repos = pkg_list_repos(); \$upgrade = \"\"; foreach(\$repos as \$r) { if (!isset(\$r[\"default\"])) { echo \$r[\"name\"] . \"|\" . \$r[\"descr\"]; break; } } echo \$upgrade ?: \"UP_TO_DATE\";"' + php -r 'require_once("/etc/inc/pkg-utils.inc"); $repos = pkg_list_repos(); $upgrade = ""; foreach($repos as $r) { if (! isset($r["default"])) { echo $r["name"] . "|" . $r["descr"]; break; } } echo $upgrade ?: "UP_TO_DATE";' register: _repo_check changed_when: false @@ -28,7 +28,7 @@ # --------------------------------------------------------------------------- - name: Get current pfSense version ansible.builtin.raw: | - /bin/sh -c 'php -r "require_once(\"/etc/inc/pkg-utils.inc\"); \$v = get_system_pkg_version(false); echo \$v[\"installed_version\"] ?? \"Unknown\";"' + php -r 'require_once("/etc/inc/pkg-utils.inc"); $v = get_system_pkg_version(false); echo $v["installed_version"] ?? "Unknown";' register: _current_version changed_when: false @@ -42,7 +42,7 @@ # --------------------------------------------------------------------------- - name: Get current default repository ansible.builtin.raw: | - /bin/sh -c 'php -r "require_once(\"/etc/inc/pkg-utils.inc\"); foreach(pkg_list_repos() as \$r) { if (isset(\$r[\"default\"])) { echo \$r[\"name\"]; } }"' + php -r 'require_once("/etc/inc/pkg-utils.inc"); foreach(pkg_list_repos() as $r) { if (isset($r["default"])) { echo $r["name"]; } }' register: _current_repo changed_when: false @@ -51,7 +51,7 @@ current_repo: "{{ _current_repo.stdout | trim | default('Unknown') }}" # --------------------------------------------------------------------------- -# 4. Extract current branch from version (e.g., "26.03" from "26.03-RELEASE") +# 4. Extract current branch from version # --------------------------------------------------------------------------- - name: Extract major.minor branch from version ansible.builtin.set_fact: @@ -92,6 +92,6 @@ msg: "System is up to date — no upgrade available" when: not upgrade_available -- name: Set facts for downstream tasks (compatibility with existing verify.yml) +- name: Set facts for downstream tasks ansible.builtin.set_fact: upgrade_available_version: "{{ upgrade_target_repo | default('') }}" \ No newline at end of file