install_from_cd.sh: Some minor paranoid fix.

This commit is contained in:
Marco Cawthorne 2021-08-29 17:46:04 +02:00
parent ae7f68ebe0
commit 1cd85e2217
2 changed files with 6 additions and 1 deletions

View File

@ -87,13 +87,15 @@ read CHOICE
if [[ "$CHOICE" == [Yy]* ]]; then if [[ "$CHOICE" == [Yy]* ]]; then
# check if we require rippin tunes # check if we require rippin tunes
if ! [ -f "$SCRPATH/music/track02.wav" ]; then if ! [ -f "$SCRPATH/music/track02.wav" ] && ! [ -f "$SCRPATH/music/track02.ogg" ]; then
if [ -x "$(command -v cdparanoia)" ]; then if [ -x "$(command -v cdparanoia)" ]; then
mkdir -p "./music" mkdir -p "./music"
cd "./music" cd "./music"
cdparanoia -B cdparanoia -B
rename ".cdda." "." *.wav rename ".cdda." "." *.wav
# Maybe the user does not have the physical disc and cdp fails.
if [ -f "$SCRPATH/music/track02.wav" ]; then
# I'd offer FLAC, but that also requires the ffmpeg plugin # I'd offer FLAC, but that also requires the ffmpeg plugin
if [ -x "$(command -v oggenc)" ]; then if [ -x "$(command -v oggenc)" ]; then
printf "All done. Would you like to convert them to OGG for playback compatibility\nas well as space preservation (frees up ~150 MB)?\ny/n: " printf "All done. Would you like to convert them to OGG for playback compatibility\nas well as space preservation (frees up ~150 MB)?\ny/n: "
@ -103,6 +105,7 @@ if [[ "$CHOICE" == [Yy]* ]]; then
rm *.wav rm *.wav
fi fi
fi fi
fi
else else
printf "cdparanoia is missing. Cannot rip music.\nPlease run the installer again once you've got it installed.\n" printf "cdparanoia is missing. Cannot rip music.\nPlease run the installer again once you've got it installed.\n"
fi fi

View File

@ -1,5 +1,6 @@
#includelist #includelist
../../../valve/src/shared/flags.h ../../../valve/src/shared/flags.h
../../../valve/src/shared/events.h
player.qc player.qc
../../../base/src/shared/weapon_common.h ../../../base/src/shared/weapon_common.h
../../../valve/src/shared/animations.h ../../../valve/src/shared/animations.h
@ -8,6 +9,7 @@ player.qc
../../../valve/src/shared/pmove_water.qc ../../../valve/src/shared/pmove_water.qc
../../../valve/src/shared/fx_blood.qc ../../../valve/src/shared/fx_blood.qc
../../../valve/src/shared/fx_gaussbeam.qc
../../../valve/src/shared/fx_breakmodel.qc ../../../valve/src/shared/fx_breakmodel.qc
../../../valve/src/shared/fx_explosion.qc ../../../valve/src/shared/fx_explosion.qc
../../../valve/src/shared/fx_gibhuman.qc ../../../valve/src/shared/fx_gibhuman.qc