From e4e73d25f123f67246e3135780869320808cdc26 Mon Sep 17 00:00:00 2001
From: Daniel Gibbs <me@danielgibbs.co.uk>
Date: Sat, 18 Feb 2023 00:09:46 +0000
Subject: [PATCH] fix: tidy up dependency csv files

---
 lgsm/data/almalinux-8.csv  | 2 +-
 lgsm/data/almalinux-9.csv  | 2 +-
 lgsm/data/centos-7.csv     | 3 ++-
 lgsm/data/centos-8.csv     | 1 +
 lgsm/data/centos-9.csv     | 1 +
 lgsm/data/debian-9.csv     | 1 +
 lgsm/data/rhel-7.csv       | 6 +++---
 lgsm/data/rhel-8.csv       | 6 +++---
 lgsm/data/rhel-9.csv       | 6 +++---
 lgsm/data/rocky-8.csv      | 2 +-
 lgsm/data/rocky-9.csv      | 2 +-
 lgsm/data/ubuntu-16.04.csv | 2 ++
 lgsm/data/ubuntu-22.04.csv | 4 +++-
 13 files changed, 23 insertions(+), 15 deletions(-)

diff --git a/lgsm/data/almalinux-8.csv b/lgsm/data/almalinux-8.csv
index 13a558282c..c7bba1d9c3 100644
--- a/lgsm/data/almalinux-8.csv
+++ b/lgsm/data/almalinux-8.csv
@@ -1,4 +1,4 @@
-all,bc,binutils,bzip2,cpio,curl,epel-release,file,glibc.i686,gzip,hostname,jq,libstdc++.i686,nmap-ncat,python36,tar,tmux,unzip,util-linux,wget,xz
+all,bc,binutils,bzip2,cpio,curl,epel-release,file,glibc.i686,gzip,hostname,jq,libstdc++,libstdc++.i686,nmap-ncat,python36,tar,tmux,unzip,util-linux,wget,xz
 steamcmd,glibc.i686,libstdc++.i686
 ac
 ahl
diff --git a/lgsm/data/almalinux-9.csv b/lgsm/data/almalinux-9.csv
index 13a558282c..c7bba1d9c3 100644
--- a/lgsm/data/almalinux-9.csv
+++ b/lgsm/data/almalinux-9.csv
@@ -1,4 +1,4 @@
-all,bc,binutils,bzip2,cpio,curl,epel-release,file,glibc.i686,gzip,hostname,jq,libstdc++.i686,nmap-ncat,python36,tar,tmux,unzip,util-linux,wget,xz
+all,bc,binutils,bzip2,cpio,curl,epel-release,file,glibc.i686,gzip,hostname,jq,libstdc++,libstdc++.i686,nmap-ncat,python36,tar,tmux,unzip,util-linux,wget,xz
 steamcmd,glibc.i686,libstdc++.i686
 ac
 ahl
diff --git a/lgsm/data/centos-7.csv b/lgsm/data/centos-7.csv
index 847877d888..e997a2e5e2 100644
--- a/lgsm/data/centos-7.csv
+++ b/lgsm/data/centos-7.csv
@@ -1,4 +1,4 @@
-all,bc,binutils,bzip2,cpio,curl,epel-release,file,glibc.i686,gzip,hostname,jq,libstdc++.i686,nmap-ncat,python3,tar,tmux,unzip,util-linux,wget,xz
+all,bc,binutils,bzip2,cpio,curl,epel-release,file,glibc.i686,gzip,hostname,jq,libstdc++,libstdc++.i686,nmap-ncat,python3,tar,tmux,unzip,util-linux,wget,xz
 steamcmd,glibc.i686,libstdc++.i686
 ac
 ahl
@@ -122,6 +122,7 @@ ut3
 ut99
 vh,glibc-devel
 vints,mono-complete
+vpmc,java-11-openjdk
 vs
 wet
 wf
diff --git a/lgsm/data/centos-8.csv b/lgsm/data/centos-8.csv
index d9e13a271e..c7bba1d9c3 100644
--- a/lgsm/data/centos-8.csv
+++ b/lgsm/data/centos-8.csv
@@ -105,6 +105,7 @@ sof2
 sol
 squad
 st
+stn
 sven
 terraria
 tf2,libcurl.i686
diff --git a/lgsm/data/centos-9.csv b/lgsm/data/centos-9.csv
index d9e13a271e..c7bba1d9c3 100644
--- a/lgsm/data/centos-9.csv
+++ b/lgsm/data/centos-9.csv
@@ -105,6 +105,7 @@ sof2
 sol
 squad
 st
+stn
 sven
 terraria
 tf2,libcurl.i686
diff --git a/lgsm/data/debian-9.csv b/lgsm/data/debian-9.csv
index e71e99c963..5fe1127027 100644
--- a/lgsm/data/debian-9.csv
+++ b/lgsm/data/debian-9.csv
@@ -122,6 +122,7 @@ ut3
 ut99
 vh,libc6-dev
 vints,mono-complete
+vpmc,openjdk-8-jre
 vs
 wet
 wf
diff --git a/lgsm/data/rhel-7.csv b/lgsm/data/rhel-7.csv
index c9a885f2b0..0016a56652 100644
--- a/lgsm/data/rhel-7.csv
+++ b/lgsm/data/rhel-7.csv
@@ -1,4 +1,4 @@
-all,bc,binutils,bzip2,cpio,curl,epel-release,file,glibc.i686,gzip,hostname,jq,libstdc++.i686,nmap-ncat,python36,tar,tmux,unzip,util-linux,wget,xz
+all,bc,binutils,bzip2,cpio,curl,epel-release,file,glibc.i686,gzip,hostname,jq,libstdc++,libstdc++.i686,nmap-ncat,python36,tar,tmux,unzip,util-linux,wget,xz
 steamcmd,glibc.i686,libstdc++.i686
 ac
 ahl
@@ -16,7 +16,7 @@ bfv,compat-libstdc++-33.i686,glibc.i686
 bmdm,ncurses-libs.i686
 bo
 bs
-bt,libicu
+bt,libicu,dos2unix
 bt1944
 cc
 cd
@@ -68,7 +68,7 @@ mcb,libnsl
 mh
 mohaa,compat-libstdc++-33.i686
 mom
-mta
+mta,ncurses-libs
 mumble
 nd
 nec
diff --git a/lgsm/data/rhel-8.csv b/lgsm/data/rhel-8.csv
index 8280391e15..c7bba1d9c3 100644
--- a/lgsm/data/rhel-8.csv
+++ b/lgsm/data/rhel-8.csv
@@ -1,4 +1,4 @@
-all,bc,binutils,bzip2,cpio,curl,epel-release,file,glibc.i686,gzip,hostname,jq,libstdc++.i686,nmap-ncat,python36,tar,tmux,unzip,util-linux,wget,xz
+all,bc,binutils,bzip2,cpio,curl,epel-release,file,glibc.i686,gzip,hostname,jq,libstdc++,libstdc++.i686,nmap-ncat,python36,tar,tmux,unzip,util-linux,wget,xz
 steamcmd,glibc.i686,libstdc++.i686
 ac
 ahl
@@ -16,7 +16,7 @@ bfv,compat-libstdc++-33.i686,glibc.i686
 bmdm,ncurses-libs.i686
 bo
 bs
-bt,libicu
+bt,libicu,dos2unix
 bt1944
 cc
 cd
@@ -68,7 +68,7 @@ mcb,libnsl
 mh
 mohaa,compat-libstdc++-33.i686
 mom
-mta
+mta,ncurses-compat-libs
 mumble
 nd
 nec
diff --git a/lgsm/data/rhel-9.csv b/lgsm/data/rhel-9.csv
index 8280391e15..c7bba1d9c3 100644
--- a/lgsm/data/rhel-9.csv
+++ b/lgsm/data/rhel-9.csv
@@ -1,4 +1,4 @@
-all,bc,binutils,bzip2,cpio,curl,epel-release,file,glibc.i686,gzip,hostname,jq,libstdc++.i686,nmap-ncat,python36,tar,tmux,unzip,util-linux,wget,xz
+all,bc,binutils,bzip2,cpio,curl,epel-release,file,glibc.i686,gzip,hostname,jq,libstdc++,libstdc++.i686,nmap-ncat,python36,tar,tmux,unzip,util-linux,wget,xz
 steamcmd,glibc.i686,libstdc++.i686
 ac
 ahl
@@ -16,7 +16,7 @@ bfv,compat-libstdc++-33.i686,glibc.i686
 bmdm,ncurses-libs.i686
 bo
 bs
-bt,libicu
+bt,libicu,dos2unix
 bt1944
 cc
 cd
@@ -68,7 +68,7 @@ mcb,libnsl
 mh
 mohaa,compat-libstdc++-33.i686
 mom
-mta
+mta,ncurses-compat-libs
 mumble
 nd
 nec
diff --git a/lgsm/data/rocky-8.csv b/lgsm/data/rocky-8.csv
index 13a558282c..c7bba1d9c3 100644
--- a/lgsm/data/rocky-8.csv
+++ b/lgsm/data/rocky-8.csv
@@ -1,4 +1,4 @@
-all,bc,binutils,bzip2,cpio,curl,epel-release,file,glibc.i686,gzip,hostname,jq,libstdc++.i686,nmap-ncat,python36,tar,tmux,unzip,util-linux,wget,xz
+all,bc,binutils,bzip2,cpio,curl,epel-release,file,glibc.i686,gzip,hostname,jq,libstdc++,libstdc++.i686,nmap-ncat,python36,tar,tmux,unzip,util-linux,wget,xz
 steamcmd,glibc.i686,libstdc++.i686
 ac
 ahl
diff --git a/lgsm/data/rocky-9.csv b/lgsm/data/rocky-9.csv
index 13a558282c..c7bba1d9c3 100644
--- a/lgsm/data/rocky-9.csv
+++ b/lgsm/data/rocky-9.csv
@@ -1,4 +1,4 @@
-all,bc,binutils,bzip2,cpio,curl,epel-release,file,glibc.i686,gzip,hostname,jq,libstdc++.i686,nmap-ncat,python36,tar,tmux,unzip,util-linux,wget,xz
+all,bc,binutils,bzip2,cpio,curl,epel-release,file,glibc.i686,gzip,hostname,jq,libstdc++,libstdc++.i686,nmap-ncat,python36,tar,tmux,unzip,util-linux,wget,xz
 steamcmd,glibc.i686,libstdc++.i686
 ac
 ahl
diff --git a/lgsm/data/ubuntu-16.04.csv b/lgsm/data/ubuntu-16.04.csv
index a571f8aace..e1cfa166be 100644
--- a/lgsm/data/ubuntu-16.04.csv
+++ b/lgsm/data/ubuntu-16.04.csv
@@ -5,6 +5,7 @@ ahl
 ahl2
 ark
 arma3
+armar,libcurl4
 ats
 av
 bb
@@ -121,6 +122,7 @@ ut3
 ut99
 vh,libc6-dev
 vints,mono-complete
+vpmc,openjdk-8-jre
 vs
 wet
 wf
diff --git a/lgsm/data/ubuntu-22.04.csv b/lgsm/data/ubuntu-22.04.csv
index 7a64eb4227..1235293240 100644
--- a/lgsm/data/ubuntu-22.04.csv
+++ b/lgsm/data/ubuntu-22.04.csv
@@ -20,6 +20,7 @@ bt,libicu-dev,dos2unix
 bt1944
 cc
 ck,xvfb
+cd
 cmw
 cod,libstdc++5:i386
 cod2,libstdc++5:i386
@@ -32,6 +33,7 @@ cscz
 csgo
 css,libtinfo5:i386
 dab
+dayz
 dmc
 dod
 dodr
@@ -120,7 +122,7 @@ ut3
 ut99
 vh,libc6-dev
 vints,mono-complete
-vpmc,openjdk-11-jre
+vpmc,openjdk-17-jre
 vs
 wet
 wf