revert some CI test changes
This commit is contained in:
@@ -214,7 +214,6 @@ if [ -d djgpp/target ]; then
|
|||||||
cd ../../
|
cd ../../
|
||||||
fi
|
fi
|
||||||
|
|
||||||
set -x
|
|
||||||
|
|
||||||
FONT_VERSION="4.49"
|
FONT_VERSION="4.49"
|
||||||
FONT_FILE="terminus-font-$FONT_VERSION"
|
FONT_FILE="terminus-font-$FONT_VERSION"
|
||||||
@@ -227,23 +226,15 @@ if [ ! -d "$FONT_LFILE" ]; then
|
|||||||
echo "Getting terminus fonts"
|
echo "Getting terminus fonts"
|
||||||
if [ "$(uname)" = "Darwin" ]; then
|
if [ "$(uname)" = "Darwin" ]; then
|
||||||
#Mac
|
#Mac
|
||||||
curl -s -L $FONT_URL --output $FONT_RFILE
|
curl -L $FONT_URL --output $FONT_RFILE
|
||||||
else
|
else
|
||||||
# wget --quiet --no-hsts $FONT_URL
|
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"
|
|
||||||
fi
|
fi
|
||||||
|
tar -xvf $FONT_RFILE
|
||||||
|
rm $FONT_RFILE
|
||||||
else
|
else
|
||||||
echo "terminus fonts are already available in lib/$FONT_LFILE"
|
echo "terminus fonts are already available in lib/$FONT_LFILE"
|
||||||
fi
|
fi
|
||||||
set +x
|
|
||||||
|
|
||||||
cd ../
|
cd ../
|
||||||
|
|
||||||
|
|||||||
@@ -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/share/NetHack.cnf $(TARGETPFX)pkg/NETHACK.CNF
|
||||||
cp ../sys/msdos/sysconf $(TARGETPFX)pkg/SYSCONF
|
cp ../sys/msdos/sysconf $(TARGETPFX)pkg/SYSCONF
|
||||||
cp ../doc/nethack.txt $(TARGETPFX)pkg/NETHACK.TXT
|
cp ../doc/nethack.txt $(TARGETPFX)pkg/NETHACK.TXT
|
||||||
-cp $(DOSFONT)/ter-u16b.psf $(TARGETPFX)pkg/TER-U16B.PSF
|
cp $(DOSFONT)/ter-u16b.psf $(TARGETPFX)pkg/TER-U16B.PSF
|
||||||
-cp $(DOSFONT)/ter-u16v.psf $(TARGETPFX)pkg/TER-U16V.PSF
|
cp $(DOSFONT)/ter-u16v.psf $(TARGETPFX)pkg/TER-U16V.PSF
|
||||||
-cp $(DOSFONT)/ter-u18b.psf $(TARGETPFX)pkg/TER-U18B.PSF
|
cp $(DOSFONT)/ter-u18b.psf $(TARGETPFX)pkg/TER-U18B.PSF
|
||||||
-cp $(DOSFONT)/ter-u20b.psf $(TARGETPFX)pkg/TER-U20B.PSF
|
cp $(DOSFONT)/ter-u20b.psf $(TARGETPFX)pkg/TER-U20B.PSF
|
||||||
-cp $(DOSFONT)/ter-u22b.psf $(TARGETPFX)pkg/TER-U22B.PSF
|
cp $(DOSFONT)/ter-u22b.psf $(TARGETPFX)pkg/TER-U22B.PSF
|
||||||
-cp $(DOSFONT)/ter-u24b.psf $(TARGETPFX)pkg/TER-U24B.PSF
|
cp $(DOSFONT)/ter-u24b.psf $(TARGETPFX)pkg/TER-U24B.PSF
|
||||||
-cp $(DOSFONT)/ter-u28b.psf $(TARGETPFX)pkg/TER-U28B.PSF
|
cp $(DOSFONT)/ter-u28b.psf $(TARGETPFX)pkg/TER-U28B.PSF
|
||||||
-cp $(DOSFONT)/ter-u32b.psf $(TARGETPFX)pkg/TER-U32B.PSF
|
cp $(DOSFONT)/ter-u32b.psf $(TARGETPFX)pkg/TER-U32B.PSF
|
||||||
cp ../lib/djgpp/cwsdpmi/bin/CWSDPMI.EXE $(TARGETPFX)pkg/CWSDPMI.EXE
|
cp ../lib/djgpp/cwsdpmi/bin/CWSDPMI.EXE $(TARGETPFX)pkg/CWSDPMI.EXE
|
||||||
( if [ -f ../lib/djgpp/target/bin/symify.exe ]; then \
|
( if [ -f ../lib/djgpp/target/bin/symify.exe ]; then \
|
||||||
cp ../lib/djgpp/target/bin/symify.exe $(TARGETPFX)pkg/SYMIFY.EXE; \
|
cp ../lib/djgpp/target/bin/symify.exe $(TARGETPFX)pkg/SYMIFY.EXE; \
|
||||||
|
|||||||
Reference in New Issue
Block a user