Skip to content

Commit

Permalink
Merge branch 'release/v23.7.0' into develop
Browse files Browse the repository at this point in the history
  • Loading branch information
@dgibbs64
dgibbs64 committed Dec 3, 2023
2 parents f28a4e5 + becff80 commit ddd3056
Show file tree
Hide file tree
Showing 26 changed files with 13 additions and 33 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/labeler.yml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ jobs:
runs-on: ubuntu-latest
steps:
- name: Issue Labeler
uses: github/issue-labeler@v3.2
uses: github/issue-labeler@v3.3
with:
repo-token: "${{ secrets.GITHUB_TOKEN }}"
configuration-path: .github/labeler.yml
Expand Down
1 change: 0 additions & 1 deletion lgsm/data/almalinux-8.csv
View file
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,6 @@ bs
bt,libicu,dos2unix,libxml2
btl
cc
cd
ck,xorg-x11-server-Xvfb
cmw
cod,compat-libstdc++-33.i686
Expand Down
1 change: 0 additions & 1 deletion lgsm/data/almalinux-9.csv
View file
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,6 @@ bs
bt,libicu,dos2unix,libxml2
btl
cc
cd
ck,xorg-x11-server-Xvfb
cmw
cod,compat-libstdc++-33.i686
Expand Down
1 change: 0 additions & 1 deletion lgsm/data/centos-7.csv
View file
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,6 @@ bs
bt,libicu,dos2unix,libxml2
btl
cc
cd
ck,xorg-x11-server-Xvfb
cmw
cod,compat-libstdc++-33.i686
Expand Down
1 change: 0 additions & 1 deletion lgsm/data/centos-8.csv
View file
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,6 @@ bs
bt,libicu,dos2unix,libxml2
btl
cc
cd
ck,xorg-x11-server-Xvfb
cmw
cod,compat-libstdc++-33.i686
Expand Down
1 change: 0 additions & 1 deletion lgsm/data/centos-9.csv
View file
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,6 @@ bs
bt,libicu,dos2unix,libxml2
btl
cc
cd
ck,xorg-x11-server-Xvfb
cmw
cod,compat-libstdc++-33.i686
Expand Down
1 change: 0 additions & 1 deletion lgsm/data/debian-10.csv
View file
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,6 @@ bs
bt,libicu-dev,dos2unix,libxml2-utils
btl
cc
cd
ck,xvfb,libxi6
cmw
cod,libstdc++5:i386
Expand Down
1 change: 0 additions & 1 deletion lgsm/data/debian-11.csv
View file
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,6 @@ bs
bt,libicu-dev,dos2unix,libxml2-utils
btl
cc
cd
ck,xvfb,libxi6
cmw
cod,libstdc++5:i386
Expand Down
1 change: 0 additions & 1 deletion lgsm/data/debian-12.csv
View file
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,6 @@ bs
bt,libicu-dev,dos2unix,libxml2-utils
btl
cc
cd
ck,xvfb,libxi6
cmw
cod,libstdc++5:i386
Expand Down
1 change: 0 additions & 1 deletion lgsm/data/debian-9.csv
View file
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,6 @@ bs
bt,libicu-dev,dos2unix,libxml2-utils
btl
cc
cd
ck,xvfb,libxi6
cmw
cod,libstdc++5:i386
Expand Down
Binary file removed lgsm/data/gameicons/cd-icon.png
View file
Binary file not shown.
1 change: 0 additions & 1 deletion lgsm/data/rhel-7.csv
View file
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,6 @@ bs
bt,libicu,dos2unix,libxml2
btl
cc
cd
ck,xorg-x11-server-Xvfb
cmw
cod,compat-libstdc++-33.i686
Expand Down
1 change: 0 additions & 1 deletion lgsm/data/rhel-8.csv
View file
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,6 @@ bs
bt,libicu,dos2unix,libxml2
btl
cc
cd
ck,xorg-x11-server-Xvfb
cmw
cod,compat-libstdc++-33.i686
Expand Down
1 change: 0 additions & 1 deletion lgsm/data/rhel-9.csv
View file
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,6 @@ bs
bt,libicu,dos2unix,libxml2
btl
cc
cd
ck,xorg-x11-server-Xvfb
cmw
cod,compat-libstdc++-33.i686
Expand Down
1 change: 0 additions & 1 deletion lgsm/data/rocky-8.csv
View file
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,6 @@ bs
bt,libicu,dos2unix,libxml2
btl
cc
cd
ck,xorg-x11-server-Xvfb
cmw
cod,compat-libstdc++-33.i686
Expand Down
1 change: 0 additions & 1 deletion lgsm/data/rocky-9.csv
View file
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,6 @@ bs
bt,libicu,dos2unix,libxml2
btl
cc
cd
ck,xorg-x11-server-Xvfb
cmw
cod,compat-libstdc++-33.i686
Expand Down
1 change: 0 additions & 1 deletion lgsm/data/ubuntu-16.04.csv
View file
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,6 @@ bs
bt,libicu-dev,dos2unix,libxml2-utils
btl
cc
cd
ck,xvfb,libxi6
cmw
cod,libstdc++5:i386
Expand Down
1 change: 0 additions & 1 deletion lgsm/data/ubuntu-18.04.csv
View file
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,6 @@ bs
bt,libicu-dev,dos2unix,libxml2-utils
btl
cc
cd
ck,xvfb,libxi6
cmw
cod,libstdc++5:i386
Expand Down
1 change: 0 additions & 1 deletion lgsm/data/ubuntu-20.04.csv
View file
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,6 @@ bs
bt,libicu-dev,dos2unix,libxml2-utils
btl
cc
cd
ck,xvfb,libxi6
cmw
cod,libstdc++5:i386
Expand Down
1 change: 0 additions & 1 deletion lgsm/data/ubuntu-22.04.csv
View file
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,6 @@ bs
bt,libicu-dev,dos2unix,libxml2-utils
btl
cc
cd
ck,xvfb,libxi6
cmw
cod,libstdc++5:i386
Expand Down
1 change: 0 additions & 1 deletion lgsm/data/ubuntu-23.04.csv
View file
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,6 @@ bs
bt,libicu-dev,dos2unix,libxml2-utils
btl
cc
cd
ck,xvfb,libxi6
cmw
cod,libstdc++5:i386
Expand Down
1 change: 0 additions & 1 deletion lgsm/data/ubuntu-23.10.csv
View file
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,6 @@ bs
bt,libicu-dev,dos2unix,libxml2-utils
btl
cc
cd
ck,xvfb,libxi6
cmw
cod,libstdc++5:i386
Expand Down
2 changes: 1 addition & 1 deletion lgsm/modules/core_modules.sh
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@

moduleselfname="$(basename "$(readlink -f "${BASH_SOURCE[0]}")")"

modulesversion="v23.6.2"
modulesversion="v23.7.0"

# Core

Expand Down
10 changes: 5 additions & 5 deletions lgsm/modules/fix_vh.sh
View file
Original file line number Diff line number Diff line change
Expand Up @@ -18,11 +18,11 @@ if [ -f "${modsinstalledlistfullpath}" ]; then
executable="./start_server_bepinex.sh"
fi
if [ -d "${serverfiles}/unstripped_corlib" ]; then
rm -rf "${serverfiles}/unstripped_corlib"
fi
sed -i 's/^dllSearchPathOverride=unstripped_corlib/# &/' "${serverfiles}/doorstop_config.ini"
sed -i 's/^export DOORSTOP_CORLIB_OVERRIDE_PATH="$BASEDIR\/unstripped_corlib"/# &/' "${serverfiles}/start_game_bepinex.sh"
sed -i 's/^export DOORSTOP_CORLIB_OVERRIDE_PATH="${VALHEIM_PLUS_PATH}\/unstripped_corlib"/# &/' "${serverfiles}/start_server_bepinex.sh"
rm -rf "${serverfiles}/unstripped_corlib"
fi
sed -i "s/^dllSearchPathOverride=unstripped_corlib/# &/" "${serverfiles}/doorstop_config.ini"
sed -i "s/^export DOORSTOP_CORLIB_OVERRIDE_PATH="$BASEDIR\/unstripped_corlib"/# &/" "${serverfiles}/start_game_bepinex.sh"
sed -i "s/^export DOORSTOP_CORLIB_OVERRIDE_PATH="${VALHEIM_PLUS_PATH}\/unstripped_corlib"/# &/" "${serverfiles}/start_server_bepinex.sh"
fi
# special exports for BepInEx if installed
if grep -qE "^bepinexvh" "${modsinstalledlistfullpath}"; then
Expand Down
10 changes: 5 additions & 5 deletions lgsm/modules/info_distro.sh
View file
Original file line number Diff line number Diff line change
Expand Up @@ -28,15 +28,15 @@ kernel="$(uname -r)" # Kernel e.g. 2.6.32-042stab120.16
distro_info_array=(os-release lsb_release hostnamectl debian_version redhat-release)
for distro_info in "${distro_info_array[@]}"; do
if [ -f "/etc/os-release" ] && [ "${distro_info}" == "os-release" ]; then
distroname="$(grep "PRETTY_NAME" /etc/os-release | awk -F\= '{gsub(/"/,"",$2);print $2}')" # e.g. Ubuntu 22.04.3 LTS
distroversion="$(grep "VERSION_ID" /etc/os-release | awk -F\= '{gsub(/"/,"",$2);print $2}')" # e.g. 22.04
distroname="$(grep "PRETTY_NAME" /etc/os-release | awk -F= '{gsub(/"/,"",$2);print $2}')" # e.g. Ubuntu 22.04.3 LTS
distroversion="$(grep "VERSION_ID" /etc/os-release | awk -F= '{gsub(/"/,"",$2);print $2}')" # e.g. 22.04
# Special var for rhel like distros to remove point in number e.g 8.4 to just 8.
if [[ "${distroidlike}" == *"rhel"* ]] || [ "${distroid}" == "rhel" ]; then
distroversionrh="$(sed -nr 's/^VERSION_ID="([0-9]*).+?"/\1/p' /etc/os-release)" # e.g. 8
fi
distroid="$(grep "ID=" /etc/os-release | grep -v _ID | awk -F\= '{gsub(/"/,"",$2);print $2}')" # e.g. ubuntu
distroidlike="$(grep "ID_LIKE=" /etc/os-release | grep -v _ID | awk -F\= '{gsub(/"/,"",$2);print $2}')" # e.g. debian
distrocodename="$(grep "VERSION_CODENAME" /etc/os-release | awk -F\= '{gsub(/"/,"",$2);print $2}')" # e.g. jammy
distroid="$(grep "ID=" /etc/os-release | grep -v _ID | awk -F= '{gsub(/"/,"",$2);print $2}')" # e.g. ubuntu
distroidlike="$(grep "ID_LIKE=" /etc/os-release | grep -v _ID | awk -F= '{gsub(/"/,"",$2);print $2}')" # e.g. debian
distrocodename="$(grep "VERSION_CODENAME" /etc/os-release | awk -F= '{gsub(/"/,"",$2);print $2}')" # e.g. jammy
elif [ "$(command -v lsb_release 2> /dev/null)" ] && [ "${distro_info}" == "lsb_release" ]; then
if [ -z "${distroname}" ]; then
distroname="$(lsb_release -sd)" # e.g. Ubuntu 22.04.3 LTS
Expand Down
2 changes: 1 addition & 1 deletion linuxgsm.sh
View file
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ if [ -f ".dev-debug" ]; then
set -x
fi

version="v23.6.2"
version="v23.7.0"
shortname="core"
gameservername="core"
commandname="CORE"
Expand Down

0 comments on commit ddd3056

Please sign in to comment.