Skip to content

Commit

Permalink
Merge pull request #37 from stephengtuggy/fix/manjaro
Browse files Browse the repository at this point in the history
Fix Manjaro missing `make`; add Pop! OS "jammy", Linux Mint 21.1 "vera", and Funtoo
  • Loading branch information
stephengtuggy authored Mar 6, 2023
2 parents 5d051a8 + 7c5e547 commit b401686
Show file tree
Hide file tree
Showing 4 changed files with 101 additions and 3 deletions.
2 changes: 2 additions & 0 deletions .github/workflows/Anchore-Container-Scan.yml
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,7 @@ jobs:
- FROM: 'ubuntu:jammy'
- FROM: 'ubuntu:focal'
- FROM: 'ubuntu:bionic'
- FROM: 'linuxmintd/mint21.1-amd64'
- FROM: 'linuxmintd/mint21-amd64'
- FROM: 'linuxmintd/mint20-amd64'
- FROM: 'debian:bookworm'
Expand All @@ -43,6 +44,7 @@ jobs:
- FROM: 'rockylinux:8.6'
- FROM: 'rockylinux:8.5'
- FROM: 'manjarolinux/base'
- FROM: 'funtoo/stage3-generic_64'

# Steps represent a sequence of tasks that will be executed as part of the job
steps:
Expand Down
2 changes: 2 additions & 0 deletions .github/workflows/gh-actions-pr.yml
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,7 @@ jobs:
- FROM: 'ubuntu:jammy'
- FROM: 'ubuntu:focal'
- FROM: 'ubuntu:bionic'
- FROM: 'linuxmintd/mint21.1-amd64'
- FROM: 'linuxmintd/mint21-amd64'
- FROM: 'linuxmintd/mint20-amd64'
- FROM: 'debian:bookworm'
Expand All @@ -33,6 +34,7 @@ jobs:
- FROM: 'rockylinux:8.6'
- FROM: 'rockylinux:8.5'
- FROM: 'manjarolinux/base'
- FROM: 'funtoo/stage3-generic_64'

steps:
- name: Checkout repository
Expand Down
2 changes: 2 additions & 0 deletions .github/workflows/gh-actions-release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,7 @@ jobs:
- FROM: 'ubuntu:jammy'
- FROM: 'ubuntu:focal'
- FROM: 'ubuntu:bionic'
- FROM: 'linuxmintd/mint21.1-amd64'
- FROM: 'linuxmintd/mint21-amd64'
- FROM: 'linuxmintd/mint20-amd64'
- FROM: 'debian:bookworm'
Expand All @@ -40,6 +41,7 @@ jobs:
- FROM: 'rockylinux:8.6'
- FROM: 'rockylinux:8.5'
- FROM: 'manjarolinux/base'
- FROM: 'funtoo/stage3-generic_64'

steps:
- name: Checkout repository
Expand Down
98 changes: 95 additions & 3 deletions script/bootstrap
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
# @param : just one parameter, either a 1 or a 0, to indicate whether or not to
# UPDATE_ALL_SYSTEM_PACKAGES
#====================================
# Copyright (C) 2020-2022 Stephen G. Tuggy and other Vega Strike contributors
# Copyright (C) 2020-2023 Stephen G. Tuggy and other Vega Strike contributors
#
# This file is part of Vega Strike.
#
Expand All @@ -29,7 +29,7 @@
set -e

echo "------------------------------"
echo "--- bootstrap | 2022-12-16 ---"
echo "--- bootstrap | 2023-03-05 ---"
echo "------------------------------"

UPDATE_ALL_SYSTEM_PACKAGES="$1"
Expand Down Expand Up @@ -381,6 +381,54 @@ function bootstrapOnUbuntu()
esac
}

function bootstrapOnPopOS ()
{
apt-get update

if [ "${UPDATE_ALL_SYSTEM_PACKAGES}" -eq 1 ]
then
apt-get -qy upgrade
fi

case "$LINUX_CODENAME" in
"jammy")
apt-get -qy install \
git \
cmake \
python3-dev \
build-essential \
automake \
autoconf \
libpng16-16 \
libpng-dev \
libpng-tools \
libjpeg-turbo8-dev \
libexpat1-dev \
libgdk-pixbuf-2.0-dev \
libgtk-3-dev \
libopenal-dev \
libogg-dev \
libvorbis-dev \
libglvnd-dev \
libgl1-mesa-dev \
libsdl1.2-dev \
libopengl0 \
libpostproc-dev \
freeglut3-dev \
libboost-python-dev \
libboost-log-dev \
libboost-regex-dev \
libxmu-dev \
clang \
lsb-release
;;
*)
echo "Sorry, this version of Pop! OS is not currently supported"
exit 2
;;
esac
}

function bootstrapOnLinuxMint ()
{
apt-get update
Expand All @@ -391,6 +439,37 @@ function bootstrapOnLinuxMint ()
fi

case "$LINUX_CODENAME" in
"vera")
apt-get -qy install \
git \
cmake \
python3-dev \
build-essential \
automake \
autoconf \
libpng16-16 \
libpng-dev \
libpng-tools \
libjpeg-turbo8-dev \
libexpat1-dev \
libgdk-pixbuf-2.0-dev \
libgtk-3-dev \
libopenal-dev \
libogg-dev \
libvorbis-dev \
libglvnd-dev \
libgl1-mesa-dev \
libsdl1.2-compat-dev \
libopengl0 \
libpostproc-dev \
freeglut3-dev \
libboost-python-dev \
libboost-log-dev \
libboost-regex-dev \
libxmu-dev \
clang \
lsb-release
;;
"vanessa")
apt-get -qy install \
git \
Expand Down Expand Up @@ -1324,7 +1403,14 @@ function bootstrapOnManjaro ()
libpng \
libvorbis \
libxmu \
openal
openal \
make
}

function bootstrapOnFuntoo ()
{
ego sync
emerge openal
}

case "${LINUX_ID}" in
Expand All @@ -1334,6 +1420,9 @@ case "${LINUX_ID}" in
"ubuntu")
bootstrapOnUbuntu
;;
"pop")
bootstrapOnPopOS
;;
"linuxmint")
bootstrapOnLinuxMint
;;
Expand All @@ -1358,6 +1447,9 @@ case "${LINUX_ID}" in
"manjaro")
bootstrapOnManjaro
;;
"funtoo")
bootstrapOnFuntoo
;;
*)
echo "Sorry, unrecognized/unsupported Linux distribution"
exit 2
Expand Down

0 comments on commit b401686

Please sign in to comment.