update q2admin-nxmod to add discord support
continuous-integration/drone/push Build is passing Details

This commit is contained in:
Daniel Wolf 2021-08-31 17:14:37 -04:00
parent 09c4764cf3
commit 135bae2b98
Signed by: nephatrine
GPG Key ID: 59D70EC2E4AAB4D0
3 changed files with 12 additions and 2 deletions

View File

@ -6,8 +6,10 @@ RUN echo "====== COMPILE QUAKE II ======" \
screen sdl2 \
&& apk add --virtual .build-quake2 build-base \
clang \
curl-dev \
git \
linux-headers \
openssl-dev \
sdl2-dev \
&& git -C /usr/src clone --single-branch --depth=1 https://github.com/yquake2/yquake2.git && cd /usr/src/yquake2 \
&& make server game && mv release /opt/quake2 \
@ -32,9 +34,11 @@ RUN echo "====== COMPILE QUAKE II ======" \
&& mv 3zb2/pak10.pak 3zb2/pak6.pak && mv 3zb2 /opt/quake2-data/ \
&& git -C /usr/src clone --single-branch --depth=1 https://github.com/yquake2/pakextract.git && cd /usr/src/pakextract \
&& make && mv pakextract /usr/local/bin/ \
&& git -C /usr/src clone --single-branch --depth=1 https://github.com/cee-studio/orca.git && cd /usr/src/orca \
&& make botx && make install \
&& git -C /usr/src clone --single-branch --depth=1 https://code.nephatrine.net/nephatrine/q2admin-nxmod.git && cd /usr/src/q2admin-nxmod \
&& make && mv release /opt/quake2-data/q2admin \
&& mv *.txt /opt/quake2-data/q2admin/ \
&& mv *.txt *.json /opt/quake2-data/q2admin/ \
&& cp /opt/quake2/baseq2/game.so /opt/quake2/baseq2/game.real.so \
&& cp /opt/quake2/3zb2/game.so /opt/quake2/3zb2/game.real.so \
&& cp /opt/quake2/ctf/game.so /opt/quake2/ctf/game.real.so \

View File

@ -8,8 +8,10 @@ RUN echo "====== COMPILE QUAKE II ======" \
screen sdl2 \
&& apk add --virtual .build-quake2 build-base \
clang \
curl-dev \
git \
linux-headers \
openssl-dev \
sdl2-dev \
&& git -C /usr/src clone --single-branch --depth=1 https://github.com/yquake2/yquake2.git && cd /usr/src/yquake2 \
&& make server game && mv release /opt/quake2 \
@ -34,9 +36,11 @@ RUN echo "====== COMPILE QUAKE II ======" \
&& mv 3zb2/pak10.pak 3zb2/pak6.pak && mv 3zb2 /opt/quake2-data/ \
&& git -C /usr/src clone --single-branch --depth=1 https://github.com/yquake2/pakextract.git && cd /usr/src/pakextract \
&& make && mv pakextract /usr/local/bin/ \
&& git -C /usr/src clone --single-branch --depth=1 https://github.com/cee-studio/orca.git && cd /usr/src/orca \
&& make botx && make install \
&& git -C /usr/src clone --single-branch --depth=1 https://code.nephatrine.net/nephatrine/q2admin-nxmod.git && cd /usr/src/q2admin-nxmod \
&& make && mv release /opt/quake2-data/q2admin \
&& mv *.txt /opt/quake2-data/q2admin/ \
&& mv *.txt *.json /opt/quake2-data/q2admin/ \
&& cp /opt/quake2/baseq2/game.so /opt/quake2/baseq2/game.real.so \
&& cp /opt/quake2/3zb2/game.so /opt/quake2/3zb2/game.real.so \
&& cp /opt/quake2/ctf/game.so /opt/quake2/ctf/game.real.so \

View File

@ -127,11 +127,13 @@ if [[ -d /opt/quake2-data/3zb2 ]]; then
fi
s6-setuidgid guardian cp -Rn /opt/quake2-data/3zb2/* /mnt/config/data/quake2/3zb2/
fi
if [[ -d /opt/quake2-data/q2admin ]]; then
if [[ ! -d /mnt/config/data/quake2/q2admin ]]; then
s6-setuidgid guardian mkdir -p /mnt/config/data/quake2/q2admin
fi
s6-setuidgid guardian cp -Rn /opt/quake2-data/q2admin/* /mnt/config/data/quake2/q2admin/
s6-setuidgid guardian cp /opt/quake2-data/q2admin/game.so /mnt/config/data/quake2/q2admin/
fi
if [[ -d /mnt/config/data/quake2/baseq2 && -d /opt/quake2-data/baseq2 ]]; then