mirror of
https://github.com/JGRennison/OpenTTD-patches.git
synced 2024-11-08 01:10:28 +00:00
(svn r21352) -Codechange: remove some unneeded code from config.lib
This commit is contained in:
parent
4aa6a24d95
commit
c0312e1011
15
config.lib
15
config.lib
@ -11,8 +11,6 @@ log() {
|
||||
}
|
||||
|
||||
set_default() {
|
||||
released_version=""
|
||||
|
||||
ignore_extra_parameters="0"
|
||||
# We set all kinds of defaults for params. Later on the user can override
|
||||
# most of them; but if they don't, this default is used.
|
||||
@ -990,16 +988,6 @@ check_params() {
|
||||
fi
|
||||
fi
|
||||
|
||||
if [ -n "$released_version" ]; then
|
||||
log 1 "checking revision... release ($released_version)"
|
||||
if [ -n "$revision" ] && [ "$revision" != "$released_version" ]; then
|
||||
log 1 "WARNING: overriding of the revision is NOT possible for releases"
|
||||
log 1 "WARNING: the given revision is IGNORED"
|
||||
|
||||
sleep 5
|
||||
fi
|
||||
revision=$released_version
|
||||
else
|
||||
if [ -n "$revision" ]; then
|
||||
log 1 "checking revision... $revision"
|
||||
log 1 "WARNING: we do not advise you to use this setting"
|
||||
@ -1020,7 +1008,7 @@ check_params() {
|
||||
elif [ -d "$ROOT_DIR/.hg" ] && [ -n "`hg help 2>/dev/null`" ]; then
|
||||
revision=""
|
||||
log 1 "checking revision... hg detection"
|
||||
elif [ -f "$ROOT_DIR/.rev" ]; then
|
||||
elif [ -f "$ROOT_DIR/.ottdrev" ]; then
|
||||
revision=""
|
||||
log 1 "checking revision... source tarball"
|
||||
else
|
||||
@ -1035,7 +1023,6 @@ check_params() {
|
||||
|
||||
sleep 5
|
||||
fi
|
||||
fi
|
||||
|
||||
if [ "$doc_dir" = "1" ]; then
|
||||
if [ "$os" = "UNIX" ] || [ "$os" = "FREEBSD" ] || [ "$os" = "OPENBSD" ] || [ "$os" = "NETBSD" ] || [ "$os" = "HPUX" ] || [ "$os" = "SUNOS" ]; then
|
||||
|
Loading…
Reference in New Issue
Block a user