Skip to content

Commit e91793f

Browse files
make fix_capitalization enabled by create_filename_symlinks
The restriction on requiring them to both be set true ... that was a little too onerous. Annoying if you change your global config to set create_filename_symlinks true and then try to go back to play previously installed mods. Instead, just have create_filename_symlinks imply fix_capitalization. Seems highly unlikely you'd ever not want that behavior anyway.
1 parent 1731909 commit e91793f

File tree

2 files changed

+4
-19
lines changed

2 files changed

+4
-19
lines changed

scripts/quakelaunch

Lines changed: 3 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -41,19 +41,6 @@ function basic_validation {
4141
fi
4242
}
4343

44-
# Function to check consistency in other conf properties, after any gamedir-
45-
# specific conf has been sourced.
46-
function more_validation {
47-
if [[ $create_filename_symlinks == "true" ]]
48-
then
49-
if [[ "$fix_capitalization" != "true" ]]
50-
then
51-
message "create_filename_symlinks can only be enabled when fix_capitalization is also enabled"
52-
exit 1
53-
fi
54-
fi
55-
}
56-
5744
# Take care of the simplest arguments cases:
5845

5946
# Forbid more than one arg.
@@ -578,7 +565,6 @@ then
578565
source "$gamedir"/quakelaunch.conf
579566
fi
580567
basic_validation
581-
more_validation
582568
# If this directory is not under basedir or (if relevant) userdata_home, we
583569
# can't deal with it.
584570
if [[ "$gamedirparent" != "$basedir" ]]
@@ -625,7 +611,6 @@ then
625611
source "$conf"
626612
fi
627613
basic_validation
628-
more_validation
629614
# Everything has been sourced. For certain overrides, note that we should
630615
# NOT try to calculate values for these vars below.
631616
if [[ $has_conf == "true" || $has_superconf == "true" ]]
@@ -679,8 +664,9 @@ then
679664
fi
680665
fi
681666
fi
682-
# Take care of any obvious capitalization gotchas.
683-
if [[ $fix_capitalization == "true" ]]
667+
# Take care of any obvious capitalization gotchas. Note that setting
668+
# create_filename_symlinks true implies forcing this true.
669+
if [[ $fix_capitalization == "true" || $create_filename_symlinks == "true" ]]
684670
then
685671
if [[ -d "$basedir"/"$mod" ]]
686672
then
@@ -1045,7 +1031,6 @@ then
10451031
basegame_error=""
10461032
source "$conf"
10471033
basic_validation
1048-
more_validation
10491034
fi
10501035
# If we just created this config, clean it up a bit by removing examples
10511036
# and then initialize the preview_readme_and_config, fix_capitalization,

scripts/quakelaunch.conf

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -61,7 +61,7 @@ fix_capitalization=true
6161
# common mistakes occur. This should be a harmless thing to enable, but it
6262
# will create a lot of symlink spam so it's false by default.
6363
# Again this should not by needed by FTE but could help with other engines.
64-
# NOTE: you can only set this true when fix_capitalization is also true.
64+
# NOTE: Setting this to true will also force fix_capitalization to true.
6565
create_filename_symlinks=false
6666

6767
# Whether Python module expak is installed, with "pip install expak". This

0 commit comments

Comments
 (0)