continuing work on hyprland build

tasks/config/hyprcursor.yml

@@ -1,8 +1,9 @@
 - name: Set hyprcursor config
   ansible.builtin.set_fact:
-    vers: "{{ pkgconfig.hyprcursor.version }}"
+    hyprcursor:
-    repo: "{{ pkgconfig.hyprcursor.repo }}"
+      vers: "{{ pkgconfig.hyprcursor.version }}"
-    pkg_deps: "{{ pkgconfig.hyprcursor.pkg_deps }}"
+      repo: "{{ pkgconfig.hyprcursor.repo }}"
-    build_deps: "{{ pkgconfig.hyprcursor.build_deps[ansible_os_family] }}"
+      pkg_deps: "{{ pkgconfig.hyprcursor.pkg_deps }}"
-    installed_files: "{{ pkgconfig.hyprcursor.build_installed_files }}"
+      build_deps: "{{ pkgconfig.hyprcursor.build_deps[ansible_os_family] }}"
-    git_path: "{{ d_tempdir.path }}/hyprcursor"
+      installed_files: "{{ pkgconfig.hyprcursor.build_installed_files }}"
+      git_path: "{{ d_tempdir.path }}/hyprcursor"

tasks/config/hyprgraphics.yml

@@ -0,0 +1,8 @@
+- name: Set hyprgraphics config
+  ansible.builtin.set_fact:
+    hyprgraphics:
+      vers: "{{ pkgconfig.hyprgraphics.version }}"
+      repo: "{{ pkgconfig.hyprgraphics.repo }}"
+      build_deps: "{{ pkgconfig.hyprgraphics.build_deps[ansible_os_family] }}"
+      installed_files: "{{ pkgconfig.hyprgraphics.build_installed_files }}"
+      git_path: "{{ d_tempdir.path }}/hyprgraphics"

tasks/config/hyprland.yml

@@ -0,0 +1,8 @@
+- name: Set hyprland config
+  ansible.builtin.set_fact:
+    hyprland:
+      vers: "{{ pkgconfig.hyprland.version }}"
+      repo: "{{ pkgconfig.hyprland.repo }}"
+      pkg_deps: "{{ pkgconfig.hyprland.pkg_deps }}"
+      build_deps: "{{ pkgconfig.hyprland.build_deps[ansible_os_family] }}"
+      installed_files: "{{ pkgconfig.hyprland.build_installed_files }}"

tasks/config/hyprlang.yml

@@ -4,6 +4,6 @@
       vers: "{{ pkgconfig.hyprlang.version }}"
       repo: "{{ pkgconfig.hyprlang.repo }}"
       pkg_deps: "{{ pkgconfig.hyprlang.pkg_deps }}"
-      build_deps: "{{ pkgconfig.hyrplang.build_deps[ansible_os_family] }}"
+      build_deps: "{{ pkgconfig.hyprlang.build_deps[ansible_os_family] }}"
       git_path: "{{ d_tempdir.path }}/hyprlang"
       installed_files: "{{ pkgconfig.hyprlang.build_installed_files }}"

tasks/config/hyprwayland_scanner.yml

@@ -4,3 +4,5 @@
       vers: "{{ pkgconfig.hyprwayland_scanner.version }}"
       repo: "{{ pkgconfig.hyprwayland_scanner.repo }}"
       build_deps: "{{ pkgconfig.hyprwayland_scanner.build_deps[ansible_os_family] }}"
+      git_path: "{{ d_tempdir.path }}/hyprwayland-scanner"
+      installed_files: "{{ pkgconfig.hyprwayland_scanner.build_installed_files }}"

tasks/pkgs/_default.yml

@@ -1,6 +0,0 @@
-# vim: set filetype=yaml.ansible :
-# TODO: implement
----
-- name: append to syspkgs
-  debug:
-    msg: "NOT IMPLEMENTED YET"

tasks/pkgs/aquamarine.yml

@@ -1,5 +1,5 @@
 - name: Ensure pkg_deps are added
-  loop: aquamarine.pkg_deps
+  loop: "{{ aquamarine.pkg_deps }}"
   loop_control:
     loop_var: pkg_dep
   vars:

tasks/pkgs/hyprland.yml

@@ -0,0 +1,13 @@
+- name: Ensure pkg_deps are added
+  loop: "{{ hyprland.pkg_deps }}"
+  loop_control:
+    loop_var: pkg_dep
+  vars:
+    pkg: "{{ pkg_dep }}"
+  ansible.builtin.include_tasks:
+    file: addpkg.yml
+
+- name: Append to pkg_src
+  ansible.builtin.set_fact:
+    pkg_sys: "{{ pkg_sys + hyprland.build_deps }}"
+    pkg_src: "{{ pkg_src + ['hyprland'] }}"

tasks/pkgs/hyprlang.yml

@@ -1,5 +1,5 @@
 - name: Ensure pkg_deps are added
-  loop: hyprlang.pkg_deps
+  loop: "{{ hyprlang.pkg_deps }}"
   loop_control:
     loop_var: pkg_dep
   vars:

tests/cleanup.sh

@@ -1,12 +1,16 @@
 #!/usr/bin/env zsh
 
+set -x
+
 [[ -f ./lib.sh ]] && source ./lib.sh || exit 1
 
+ssh-keygen -R "[127.0.0.1]:2222"
+
 for os in ${OSBUILDS[@]}
 do
-  if podman container exists ${IMAGE}:${os}
+  if podman container exists ${CONTAINER}_${os}
   then
-    podman stop ${IMAGE}:${os}
+    podman stop ${CONTAINER}_${os}
   fi
 done
 

tests/setup.sh

@@ -1,5 +1,7 @@
 #!/usr/bin/env zsh
 
+set -x
+
 [[ -f ./lib.sh ]] && source ./lib.sh || exit 1
 
 if [ "$HOSTOS" = "Darwin" ]

tests/test.sh

@@ -1,17 +1,13 @@
 #!/usr/bin/env zsh
 
+set -x
+
 [[ -f ./lib.sh ]] && source ./lib.sh || exit 1
 
 for os in ${OSBUILDS[@]}
 do
-  if ! podman container exists ${IMAGE}:${os}
+  if ! podman container exists ${CONTAINER}_${os}; then
-  then
+    podman run --rm -it -d --platform linux/amd64 --name ${CONTAINER}_${os} -p 2222:22 ${IMAGE}:${os}
-    podman run --rm -it -d --platform linux/amd64 --name ${IMAGE}:${os} -p 2222:22 packagetest
-  fi
-  ansible-playbook test_not_local.yml -i inventory.yml
-  if [ $? -eq 0 ]
-  then
-    podman stop ${IMAGE}:${os}
-    ssh-keygen -R "[127.0.0.1]:2222"
   fi
+  ansible-playbook "test.yml" -i inventory.yml
 done

tests/test.yml

@@ -0,0 +1,12 @@
+---
+- hosts: localhost
+  vars:
+    testpkgs:
+      - hyprland
+  tasks:
+    - name: Test all packages with use_local=false
+      ansible.builtin.include_role:
+        name: ansible_role_package
+      vars:
+        use_local: false
+        packages: "{{ testpkgs }}"

tests/test_not_local.yml

@@ -1,113 +0,0 @@
----
-- hosts: localhost
-  vars:
-    testpkgs:
-      - hyprland
-      # - air
-      # - alacritty
-      # - ansible-language-server
-      # - ansible-lint
-      # - ansible
-      # - bashls
-      # - bat
-      # - bitwarden
-      # - blender
-      # - broot
-      # - btop
-      # - buf
-      # - bufls
-      # - carapace
-      # - cheat
-      # - checkmake
-      # - choose
-      # - clangd
-      # - cmake
-      # - cmakelang
-      # - commitlint-cli
-      # - commitlint-config-conventional
-      # - consul
-      # - cssls
-      # - curlie
-      # - dbeaver
-      # - direnv
-      # - dockerls
-      # - dotenv-linter
-      # - duf
-      # - dust
-      # - editorconfig
-      # - eslint
-      # - eza
-      # - fd
-      # - firefox
-      # - flatpak
-      # - fzf
-      # - ghostty
-      # - git
-      # - glow
-      # - go
-      # - godot
-      # - gopls
-      # - gping
-      # - heroic
-      # - htmlls
-      # - htmx-lsp
-      # - httpie
-      # - hugo
-      # - hyperfine
-      # - intelephense
-      # - jinja-lsp
-      # - jq
-      # - jsonls
-      # - kitty
-      # - lazygit
-      # - libreoffice
-      # - lua-language-server
-      # - markdownlint-cli
-      # - mcfly
-      # - neovide
-      # - neovim
-      # - nerdfonts
-      # - nextcloud
-      # - nginxls
-      # - nodejs
-      # - nomad
-      # - packer
-      # - pandoc
-      # - pgadmin
-      # - pipx
-      # - podman
-      # - pyright
-      # - python3
-      # - quobix-vacuum
-      # - revive
-      # - ripgrep
-      # - rust
-      # - sd
-      # - sqlfluff
-      # - sqlls
-      # - starship
-      # - stow
-      # - tailscale
-      # - tailwindcss-languageserver
-      # - templ
-      # - terraform
-      # - terraformls
-      # - thunderbird
-      # - tidy
-      # - tldr
-      # - tmux
-      # - vault
-      # - xh
-      # - yamlls
-      # - zfs
-      # - zig
-      # - zls
-      # - zoxide
-      # - zsh
-  tasks:
-    - name: Test all packages with use_local=false
-      ansible.builtin.include_role:
-        name: ansible_role_package
-      vars:
-        use_local: false
-        packages: "{{ testpkgs }}"

vars/main.yml

@@ -27,3 +27,4 @@ defaults:
 
 ## Extra config that usually will not need to be changed
 hyprland_clean: true
+hyprgitbase: https://github.com/hyprwm

vars/pkgs/aquamarine.yml

@@ -1,6 +1,6 @@
 aquamarine:
   version: v0.7.2
-  repo: https://github.com/hyprwm/aquamarine
+  repo: "{{ hyprgitbase }}/aquamarine"
   pkg_deps:
     - hyprwayland_scanner
     - hyprutils

vars/pkgs/hyprcursor.yml

@@ -1,6 +1,6 @@
 hyprcursor:
   version:
-  repo: https://github.com/hyprwm/hyprcursor
+  repo: "{{ hyprgitbase }}/hyprcursor"
   pkg_deps:
     - hyprlang
   build_deps:

vars/pkgs/hyprgraphics.yml

@@ -0,0 +1,6 @@
+hyprgraphics:
+  version:
+  repo: "{{ hyprgitbase }}/hyprgraphics"
+  build_deps:
+    RedHat: []
+  build_installed_files: []

vars/pkgs/hyprland.yml

@@ -1,6 +1,6 @@
 hyprland:
   version: v0.47.2
-  repo: https://github.com/hyprwm/Hyprland
+  repo: "{{ hyprgitbase }}/Hyprland"
   pkg_deps:
     - hyprwayland_scanner
     - hyprutils

vars/pkgs/hyprlang.yml

@@ -1,6 +1,6 @@
 hyprlang:
   version: v0.6.0
-  repo: https://github.com/hyprwm/hyprlang
+  repo: "{{ hyprgitbase }}/hyprlang"
   pkg_deps: []
   build_deps:
     RedHat: []

vars/pkgs/hyprutils.yml

@@ -1,6 +1,6 @@
 hyprutils:
   version: v0.5.1
-  repo: https://github.com/hyprwm/hyprutils
+  repo: "{{ hyprgitbase }}/hyprutils"
   build_deps:
     RedHat:
       - pixman-devel

vars/pkgs/hyprwayland_scanner.yml

@@ -1,6 +1,6 @@
 hyprwayland_scanner:
   version: v0.4.4
-  repo: https://github.com/hyprwm/hyprwayland-scanner
+  repo: "{{ hyprgitbase }}/hyprwayland-scanner"
   build_deps:
     RedHat:
       - pugixml-devel