mirror of
https://github.com/vcmi/vcmi.git
synced 2025-04-27 12:22:45 +02:00
vcmibuilder: remove references to deprecated (and disabled) core.zip download
Closes: #1038
This commit is contained in:
parent
3600d09ece
commit
d280eca241
21
vcmibuilder
21
vcmibuilder
@ -29,7 +29,6 @@ do
|
|||||||
--data) data_dir=$2 ; shift 2 ;;
|
--data) data_dir=$2 ; shift 2 ;;
|
||||||
--dest) dest_dir=$2 ; shift 2 ;;
|
--dest) dest_dir=$2 ; shift 2 ;;
|
||||||
--convertMP3) useffmpeg=true; shift 1 ;;
|
--convertMP3) useffmpeg=true; shift 1 ;;
|
||||||
# --download) download=true ; shift 1 ;;
|
|
||||||
--validate) validate=true ; shift 1 ;;
|
--validate) validate=true ; shift 1 ;;
|
||||||
*) print_help=true ; shift 1 ;;
|
*) print_help=true ; shift 1 ;;
|
||||||
esac
|
esac
|
||||||
@ -53,9 +52,6 @@ then
|
|||||||
echo " --convertMP3 " "Convert all mp3 files into ogg/vorbis"
|
echo " --convertMP3 " "Convert all mp3 files into ogg/vorbis"
|
||||||
echo " " "Requires ffmpeg or avconv"
|
echo " " "Requires ffmpeg or avconv"
|
||||||
echo
|
echo
|
||||||
# echo " --download " "Automatically download optional package using wget"
|
|
||||||
# echo " " "Requires wget and Internet connection"
|
|
||||||
# echo
|
|
||||||
echo " --dest DIRECTORY " "Path where resulting data will be placed. Default is ~/.local/share/vcmi"
|
echo " --dest DIRECTORY " "Path where resulting data will be placed. Default is ~/.local/share/vcmi"
|
||||||
echo
|
echo
|
||||||
echo " --validate " "Run basic validness checks"
|
echo " --validate " "Run basic validness checks"
|
||||||
@ -137,11 +133,6 @@ then
|
|||||||
test_utility "unshield" "-V"
|
test_utility "unshield" "-V"
|
||||||
fi
|
fi
|
||||||
|
|
||||||
if [[ -n "$download" ]]
|
|
||||||
then
|
|
||||||
test_utility "unzip"
|
|
||||||
fi
|
|
||||||
|
|
||||||
if [[ -z "$gog_file" ]] && [[ -z "$data_dir" ]] && ( [[ -z "$cd1_dir" ]] || [[ -z "$cd2_dir" ]] )
|
if [[ -z "$gog_file" ]] && [[ -z "$data_dir" ]] && ( [[ -z "$cd1_dir" ]] || [[ -z "$cd2_dir" ]] )
|
||||||
then
|
then
|
||||||
warning "Warning: Selected options will not create complete Heroes 3 data!"
|
warning "Warning: Selected options will not create complete Heroes 3 data!"
|
||||||
@ -236,18 +227,6 @@ then
|
|||||||
cp -r "$data_dir"/[Mm][Pp]3 "$dest_dir"
|
cp -r "$data_dir"/[Mm][Pp]3 "$dest_dir"
|
||||||
fi
|
fi
|
||||||
|
|
||||||
if [[ -n "$download" ]]
|
|
||||||
then
|
|
||||||
wget "http://download.vcmi.eu/core.zip" -O "$temp_dir"/core.zip || fail "Error: failed to download VCMI archive!" "rm -f core.zip"
|
|
||||||
vcmi_archive="$temp_dir"/core.zip
|
|
||||||
fi
|
|
||||||
|
|
||||||
if [[ -n "$vcmi_archive" ]]
|
|
||||||
then
|
|
||||||
echo "decompressing $vcmi_archive"
|
|
||||||
unzip -qo "$vcmi_archive" -d "$dest_dir" || fail "Error: failed to extract VCMI archive!"
|
|
||||||
fi
|
|
||||||
|
|
||||||
if [[ -n "$useffmpeg" ]]
|
if [[ -n "$useffmpeg" ]]
|
||||||
then
|
then
|
||||||
# now when all music files were installed convert them to ogg
|
# now when all music files were installed convert them to ogg
|
||||||
|
Loading…
x
Reference in New Issue
Block a user