revert some CI test changes

This commit is contained in:
nhmall
2025-11-10 09:19:47 -05:00
parent efbc0d8f8f
commit 2c747b079e
2 changed files with 12 additions and 21 deletions

View File

@@ -214,7 +214,6 @@ if [ -d djgpp/target ]; then
cd ../../
fi
set -x
FONT_VERSION="4.49"
FONT_FILE="terminus-font-$FONT_VERSION"
@@ -227,23 +226,15 @@ if [ ! -d "$FONT_LFILE" ]; then
echo "Getting terminus fonts"
if [ "$(uname)" = "Darwin" ]; then
#Mac
curl -s -L $FONT_URL --output $FONT_RFILE
curl -L $FONT_URL --output $FONT_RFILE
else
# wget --quiet --no-hsts $FONT_URL
curl --help all
curl -s -L $FONT_URL --output $FONT_RFILE
fi
ls -l
if [ -f "$FONT_RFILE" ]; then
tar -xvf $FONT_RFILE
rm $FONT_RFILE
else
echo "terminus fonts failed to download correctly to lib/$FONT_LFILE"
wget --quiet --no-hsts $FONT_URL
fi
tar -xvf $FONT_RFILE
rm $FONT_RFILE
else
echo "terminus fonts are already available in lib/$FONT_LFILE"
fi
set +x
cd ../

View File

@@ -57,14 +57,14 @@ dospkg: dodata dosfonts $(GAMEBIN) $(TARGETPFX)recover.exe ../dat/nhtiles.bmp
cp ../sys/share/NetHack.cnf $(TARGETPFX)pkg/NETHACK.CNF
cp ../sys/msdos/sysconf $(TARGETPFX)pkg/SYSCONF
cp ../doc/nethack.txt $(TARGETPFX)pkg/NETHACK.TXT
-cp $(DOSFONT)/ter-u16b.psf $(TARGETPFX)pkg/TER-U16B.PSF
-cp $(DOSFONT)/ter-u16v.psf $(TARGETPFX)pkg/TER-U16V.PSF
-cp $(DOSFONT)/ter-u18b.psf $(TARGETPFX)pkg/TER-U18B.PSF
-cp $(DOSFONT)/ter-u20b.psf $(TARGETPFX)pkg/TER-U20B.PSF
-cp $(DOSFONT)/ter-u22b.psf $(TARGETPFX)pkg/TER-U22B.PSF
-cp $(DOSFONT)/ter-u24b.psf $(TARGETPFX)pkg/TER-U24B.PSF
-cp $(DOSFONT)/ter-u28b.psf $(TARGETPFX)pkg/TER-U28B.PSF
-cp $(DOSFONT)/ter-u32b.psf $(TARGETPFX)pkg/TER-U32B.PSF
cp $(DOSFONT)/ter-u16b.psf $(TARGETPFX)pkg/TER-U16B.PSF
cp $(DOSFONT)/ter-u16v.psf $(TARGETPFX)pkg/TER-U16V.PSF
cp $(DOSFONT)/ter-u18b.psf $(TARGETPFX)pkg/TER-U18B.PSF
cp $(DOSFONT)/ter-u20b.psf $(TARGETPFX)pkg/TER-U20B.PSF
cp $(DOSFONT)/ter-u22b.psf $(TARGETPFX)pkg/TER-U22B.PSF
cp $(DOSFONT)/ter-u24b.psf $(TARGETPFX)pkg/TER-U24B.PSF
cp $(DOSFONT)/ter-u28b.psf $(TARGETPFX)pkg/TER-U28B.PSF
cp $(DOSFONT)/ter-u32b.psf $(TARGETPFX)pkg/TER-U32B.PSF
cp ../lib/djgpp/cwsdpmi/bin/CWSDPMI.EXE $(TARGETPFX)pkg/CWSDPMI.EXE
( if [ -f ../lib/djgpp/target/bin/symify.exe ]; then \
cp ../lib/djgpp/target/bin/symify.exe $(TARGETPFX)pkg/SYMIFY.EXE; \