diff --git a/molecule/default/molecule.yml b/molecule/default/molecule.yml index 0b85455..e5fbf56 100644 --- a/molecule/default/molecule.yml +++ b/molecule/default/molecule.yml @@ -15,6 +15,9 @@ platforms: #box: generic/rocky8 - name: rocky9 box: generic/rocky9 + - name: debian + box: generic/debian11 + provisioner: name: ansible @@ -32,5 +35,8 @@ provisioner: rocky9: user: name: vagrant + debian: + user: + name: vagrant verifier: name: ansible diff --git a/tasks/base_software.yml b/tasks/base_software.yml index 367dae5..55cdb6a 100644 --- a/tasks/base_software.yml +++ b/tasks/base_software.yml @@ -57,12 +57,13 @@ - name: GITHUB | Get current version of bat shell: > - set -o pipefail warn=False - curl --silent https://github.com/sharkdp/bat/releases/latest | - grep 'tag' | - sed -E 's/.*v([0-9].[0-9][0-9].[0-9]).*/\1/' + curl -L --silent https://api.github.com/repos/sharkdp/bat/releases/latest | + grep '"tag_name":' | + sed -E 's/.*"([^"]+)".*/\1/'|sed 's/v//' + register: bat_version + changed_when: false failed_when: > bat_version.rc != 0 or not bat_version.stdout|regex_search('\w+\.\w+\.\w+') diff --git a/vars/Debian.yml b/vars/Debian.yml index 2c17b19..9115e16 100644 --- a/vars/Debian.yml +++ b/vars/Debian.yml @@ -1,7 +1,7 @@ system_base_softwares: - "zsh" - "lsof" - - "glances" + # - "glances" - "stow" - "wakeonlan" - "nmap" @@ -16,7 +16,6 @@ system_base_softwares: - "thefuck" - "tldr" - "ntfs-3g" - - "python-lxml" - "tmux" - "neovim" - "python3-neovim" @@ -35,4 +34,4 @@ system_base_softwares: - "fonts-cascadia-code" - "fd-find" - "fzf" - - "xterm-kitty" +# - "xterm-kitty diff --git a/vars/RedHat.yml b/vars/RedHat.yml index ab16cce..867e55b 100644 --- a/vars/RedHat.yml +++ b/vars/RedHat.yml @@ -27,11 +27,8 @@ system_base_softwares: - "unzip" - "unrar" - "git-lfs" - - "httpie" - "lsof" - - "glances" - "ethtool" - - "netcat" #- "netctl" - "logrotate" #- "otf-cascadia-code"