Browse Source

remove i386 command if not needed

pull/3568/head
Daniel Gibbs 4 years ago
parent
commit
68b5118728
  1. 3
      lgsm/data/almalinux-8.4.csv
  2. 3
      lgsm/data/centos-7.csv
  3. 3
      lgsm/data/centos-8.csv
  4. 1
      lgsm/data/debian-10.csv
  5. 1
      lgsm/data/debian-11.csv
  6. 1
      lgsm/data/debian-9.csv
  7. 3
      lgsm/data/rocky-8.4.csv
  8. 1
      lgsm/data/ubuntu-16.04.csv
  9. 1
      lgsm/data/ubuntu-18.04.csv
  10. 1
      lgsm/data/ubuntu-20.04.csv
  11. 1
      lgsm/data/ubuntu-21.04.csv
  12. 12
      lgsm/functions/check_deps.sh

3
lgsm/data/almalinux-8.4.csv

@ -1,4 +1,3 @@
install,dnf install
all,epel-release,curl,wget,util-linux,python36,file,tar,gzip,bzip2,unzip,xz,binutils,bc,jq,tmux,nmap-ncat,cpio,hostname
ac
ahl
@ -58,7 +57,7 @@ lo
l4d
l4d2
mc,java-11-openjdk
mcb
mcb,libnsl
mh
mohaa,compat-libstdc++-33.i686
mom

Can't render this file because it has a wrong number of fields in line 2.

3
lgsm/data/centos-7.csv

@ -1,4 +1,3 @@
install,dnf install
all,epel-release,curl,wget,util-linux,python36,file,tar,gzip,bzip2,unzip,xz,binutils,bc,jq,tmux,nmap-ncat,cpio,hostname
ac
ahl
@ -58,7 +57,7 @@ lo
l4d
l4d2
mc,java-11-openjdk
mcb
mcb,libnsl
mh
mohaa,compat-libstdc++-33.i686
mom

Can't render this file because it has a wrong number of fields in line 2.

3
lgsm/data/centos-8.csv

@ -1,4 +1,3 @@
install,dnf install
all,epel-release,curl,wget,util-linux,python36,file,tar,gzip,bzip2,unzip,xz,binutils,bc,jq,tmux,nmap-ncat,cpio,hostname
ac
ahl
@ -58,7 +57,7 @@ lo
l4d
l4d2
mc,java-11-openjdk
mcb
mcb,libnsl
mh
mohaa,compat-libstdc++-33.i686
mom

Can't render this file because it has a wrong number of fields in line 2.

1
lgsm/data/debian-10.csv

@ -1,4 +1,3 @@
install,apt install
all,bc,binutils,bsdmainutils,bzip2,ca-certificates,cpio,curl,file,gzip,jq,python3,tar,tmux,util-linux,netcat,unzip,xz-utils,lib32gcc1,lib32stdc++6,hostname
ac
ahl

Can't render this file because it has a wrong number of fields in line 2.

1
lgsm/data/debian-11.csv

@ -1,4 +1,3 @@
install,apt install
all,bc,binutils,bsdmainutils,bzip2,ca-certificates,cpio,curl,file,gzip,jq,python3,tar,tmux,util-linux,netcat,unzip,xz-utils,lib32gcc-s1,lib32stdc++6,hostname
ac
ahl

Can't render this file because it has a wrong number of fields in line 2.

1
lgsm/data/debian-9.csv

@ -1,4 +1,3 @@
install,apt install
all,bc,binutils,bsdmainutils,bzip2,ca-certificates,cpio,curl,file,gzip,jq,python3,tar,tmux,util-linux,netcat,unzip,xz-utils,lib32gcc1,lib32stdc++6,hostname
ac
ahl

Can't render this file because it has a wrong number of fields in line 2.

3
lgsm/data/rocky-8.4.csv

@ -1,4 +1,3 @@
install,dnf install
all,epel-release,curl,wget,util-linux,python36,file,tar,gzip,bzip2,unzip,xz,binutils,bc,jq,tmux,nmap-ncat,cpio,hostname
ac
ahl
@ -58,7 +57,7 @@ lo
l4d
l4d2
mc,java-11-openjdk
mcb
mcb,libnsl
mh
mohaa,compat-libstdc++-33.i686
mom

Can't render this file because it has a wrong number of fields in line 2.

1
lgsm/data/ubuntu-16.04.csv

@ -1,4 +1,3 @@
install,apt install
all,bc,binutils,bsdmainutils,bzip2,ca-certificates,cpio,curl,file,gzip,jq,python3,tar,tmux,util-linux,netcat,unzip,xz-utils,lib32gcc1,lib32stdc++6,hostname
ac
ahl

Can't render this file because it has a wrong number of fields in line 2.

1
lgsm/data/ubuntu-18.04.csv

@ -1,4 +1,3 @@
install,apt install
all,bc,binutils,bsdmainutils,bzip2,ca-certificates,cpio,curl,file,gzip,jq,python3,tar,tmux,util-linux,netcat,unzip,xz-utils,lib32gcc1,lib32stdc++6,hostname
ac
ahl

Can't render this file because it has a wrong number of fields in line 2.

1
lgsm/data/ubuntu-20.04.csv

@ -1,4 +1,3 @@
install,apt install
all,bc,binutils,bsdmainutils,bzip2,ca-certificates,cpio,curl,file,gzip,jq,python3,tar,tmux,util-linux,netcat,unzip,xz-utils,lib32gcc1,lib32stdc++6,hostname
steamcmd,lib32gcc1,lib32stdc++6,libsdl2-2.0-0:i386
ac

Can't render this file because it has a wrong number of fields in line 2.

1
lgsm/data/ubuntu-21.04.csv

@ -1,4 +1,3 @@
install,apt install
all,bc,binutils,bsdmainutils,bzip2,ca-certificates,cpio,curl,file,gzip,jq,python3,tar,tmux,util-linux,netcat,unzip,xz-utils,lib32gcc-s1,lib32stdc++6,hostname
ac
ahl

Can't render this file because it has a wrong number of fields in line 2.

12
lgsm/functions/check_deps.sh

@ -144,6 +144,13 @@ fn_install_missing_deps(){
fi
# Add sudo dpkg --add-architecture i386 if using i386 packages.
if [ "$(command -v dpkg-query 2>/dev/null)" ]; then
if printf '%s\n' "${array_deps_required[@]}" | grep -q -P 'i386'; then
i386installcommand="sudo dpkg --add-architecture i386; "
fi
fi
# If automatic dependency install is available
if [ "${autodepinstall}" == "0" ]; then
fn_print_information_nl "Automatically installing missing dependencies."
@ -156,7 +163,7 @@ fn_install_missing_deps(){
sleep 1
echo -en " \r"
if [ "$(command -v dpkg-query 2>/dev/null)" ]; then
cmd="echo steamcmd steam/question select \"I AGREE\" | sudo debconf-set-selections; echo steamcmd steam/license note '' | sudo debconf-set-selections; sudo dpkg --add-architecture i386; sudo apt-get update; sudo apt-get -y install ${array_deps_missing[*]}"
cmd="echo steamcmd steam/question select \"I AGREE\" | sudo debconf-set-selections; echo steamcmd steam/license note '' | sudo debconf-set-selections; ${i386installcommand}sudo apt-get update; sudo apt-get -y install ${array_deps_missing[*]}"
eval "${cmd}"
elif [ "$(command -v dnf 2>/dev/null)" ]; then
cmd="sudo dnf -y install ${array_deps_missing[*]}"
@ -171,7 +178,7 @@ fn_install_missing_deps(){
# If automatic dependency install is unavailable.
if [ "${autodepinstall}" != "0" ]; then
if [ "$(command -v dpkg-query 2>/dev/null)" ]; then
echo -e "sudo dpkg --add-architecture i386; sudo apt update; sudo apt install ${array_deps_missing[*]}"
echo -e "${i386installcommand}sudo apt update; sudo apt install ${array_deps_missing[*]}"
elif [ "$(command -v dnf 2>/dev/null)" ]; then
echo -e "sudo dnf install ${array_deps_missing[*]}"
elif [ "$(command -v yum 2>/dev/null)" ]; then
@ -301,7 +308,6 @@ fi
# If the file successfully downloaded run the dependency check.
if [ -f "${datadir}/${distroid}-${distroversion}.csv" ]; then
depinstall=$(awk -F, '$1=="install" {$1=""; print $0}' "${datadir}/${distroid}-${distroversion}.csv")
depall=$(awk -F, '$1=="all" {$1=""; print $0}' "${datadir}/${distroid}-${distroversion}.csv")
depsteamcmd=$(awk -F, '$1=="steamcmd" {$1=""; print $0}' "${datadir}/${distroid}-${distroversion}.csv")
depshortname=$(awk -v shortname="$shortname" -F, '$1==shortname {$1=""; print $0}' "${datadir}/${distroid}-${distroversion}.csv")

Loading…
Cancel
Save