From 18884a4efbc65188cf7c463e86f80a0add596636 Mon Sep 17 00:00:00 2001
From: Brian Lee <blee@satstack.cloud>
Date: Sat, 29 Jul 2023 18:14:08 -0700
Subject: [PATCH] Removed debug comments and tested on Archlinux, Debian 11,
 Ubuntu 22.04

---
 tasks/build.yml    |  6 +++---
 tasks/main.yml     | 15 +++++++--------
 vars/Archlinux.yml |  6 +++---
 vars/Debian.yml    |  5 +++--
 vars/RedHat.yml    |  6 ++++--
 vars/Ubuntu.yml    | 14 --------------
 6 files changed, 20 insertions(+), 32 deletions(-)
 delete mode 100644 vars/Ubuntu.yml

diff --git a/tasks/build.yml b/tasks/build.yml
index b538799..f45945a 100644
--- a/tasks/build.yml
+++ b/tasks/build.yml
@@ -16,16 +16,16 @@
   ansible.builtin.command:
     cmd: git submodule update --init
     chdir: "{{ ansible_env.HOME }}/src/strfry"
-  when: git_repository.changed
+ #when: git_repository.changed
 
 - name: Run make setup-golpe
   ansible.builtin.command:
     cmd: make setup-golpe
     chdir: "{{ ansible_env.HOME }}/src/strfry"
-  when: git_repository.changed
+ #when: git_repository.changed
 
 - name: Build strfry
   ansible.builtin.command:
     cmd: "make -j{{ strfry_make_jobs|default(1) }}"
     chdir: "{{ ansible_env.HOME }}/src/strfry"
-  when: git_repository.changed
\ No newline at end of file
+ #when: git_repository.changed
\ No newline at end of file
diff --git a/tasks/main.yml b/tasks/main.yml
index e931792..c28b3d2 100644
--- a/tasks/main.yml
+++ b/tasks/main.yml
@@ -6,19 +6,18 @@
     - "{{ ansible_distribution }}.yml"
     - "{{ ansible_os_family }}.yml"
 
-- name: Install compiler dependencies (Debian)
+- name: Install build dependencies
   ansible.builtin.package:
-    name: "{{ compiler_packages }}"
+    name: "{{ strfry_build_dependencies }}"
     state: present
-  when: ansible_os_family == 'Debian'
   become: true
 
-- name: Set up strfry user
+- name: Set up local user account
   import_tasks: setup-user.yml
 
-#- name: Run build tasks
-#  import_tasks: build.yml
-#  tags: build
+- name: Run build tasks
+  import_tasks: build.yml
+  tags: build
 
-- name: Install strfry
+- name: Proceeding with installation
   import_tasks: install.yml
\ No newline at end of file
diff --git a/vars/Archlinux.yml b/vars/Archlinux.yml
index 434855b..1e5779f 100644
--- a/vars/Archlinux.yml
+++ b/vars/Archlinux.yml
@@ -1,11 +1,11 @@
 ---
-compiler_packages:
+strfry_build_dependencies:
   - base-devel
   - flatbuffers
   - git
   - lmdb
   - openssl
-  - perl-regexp-grammars
   - perl-template-toolkit
   - perl-yaml
-  - zlib
\ No newline at end of file
+  - zlib
+  - libb2
\ No newline at end of file
diff --git a/vars/Debian.yml b/vars/Debian.yml
index b79ae4a..1a43de9 100644
--- a/vars/Debian.yml
+++ b/vars/Debian.yml
@@ -1,5 +1,5 @@
 ---
-compiler_packages:
+strfry_build_dependencies:
   - build-essential
   - git
   - libflatbuffers-dev
@@ -10,4 +10,5 @@ compiler_packages:
   - libtemplate-perl
   - libyaml-perl
   - libzstd-dev
-  - zlib1g-dev
\ No newline at end of file
+  - zlib1g-dev
+  - libb2-dev
\ No newline at end of file
diff --git a/vars/RedHat.yml b/vars/RedHat.yml
index f81d20e..590baa2 100644
--- a/vars/RedHat.yml
+++ b/vars/RedHat.yml
@@ -1,9 +1,11 @@
 ---
-compiler_packages:
+strfry_build_dependencies:
   - @development-tools
+# - flatbuffers # epel?
   - git
   - lmdb-devel
   - openssl-devel
   - perl-Template-Toolkit
   - perl-YAML
-  - zlib-devel
\ No newline at end of file
+  - zlib-devel
+  - libb2
\ No newline at end of file
diff --git a/vars/Ubuntu.yml b/vars/Ubuntu.yml
deleted file mode 100644
index 3e28e2a..0000000
--- a/vars/Ubuntu.yml
+++ /dev/null
@@ -1,14 +0,0 @@
----
-compiler_packages:
-  - build-essential
-  - git
-  - libflatbuffers-dev
-  - liblmdb-dev
-  - libregexp-grammars-perl
-  - libsecp256k1-dev
-  - libssl-dev
-  - libtemplate-perl
-  - libyaml-perl
-  - libzstd-dev
-  - zlib1g-dev
-  - libb2-dev # Ubuntu 22.04
\ No newline at end of file