Browse Source

glibcfix shouls run with correct functions

pull/820/merge
Daniel Gibbs 9 years ago
parent
commit
9161b0078d
  1. 10
      lgsm/functions/check.sh
  2. 11
      lgsm/functions/check_glibc.sh
  3. 2
      lgsm/functions/fix_glibc.sh

10
lgsm/functions/check.sh

@ -17,9 +17,13 @@ if [ "${function_selfname}" != "command_install.sh" ] && [ "${function_selfname}
check_system_dir.sh check_system_dir.sh
fi fi
if [ "${function_selfname}" == "command_install.sh" ]; then local allowed_commands_array=( command_debug.sh command_start.sh command_stop.sh command_install.sh )
check_glibc.sh for allowed_command in "${allowed_commands_array[@]}"
fi do
if [ "${allowed_command}" == "${function_selfname}" ]; then
check_glibc.sh
fi
done
local allowed_commands_array=( command_backup.sh command_console.sh command_debug.sh command_details.sh command_unreal2_maps.sh command_ut99_maps.sh command_monitor.sh command_start.sh command_stop.sh update_check.sh command_validate.sh command_update_functions.sh command_email_test.sh ) local allowed_commands_array=( command_backup.sh command_console.sh command_debug.sh command_details.sh command_unreal2_maps.sh command_ut99_maps.sh command_monitor.sh command_start.sh command_stop.sh update_check.sh command_validate.sh command_update_functions.sh command_email_test.sh )
for allowed_command in "${allowed_commands_array[@]}" for allowed_command in "${allowed_commands_array[@]}"

11
lgsm/functions/check_glibc.sh

@ -11,10 +11,12 @@ info_distro.sh
if [ "$(printf '%s\n'${glibcrequired}'\n' ${glibcversion} | sort -V | head -n 1)" != "${glibcrequired}" ]; then if [ "$(printf '%s\n'${glibcrequired}'\n' ${glibcversion} | sort -V | head -n 1)" != "${glibcrequired}" ]; then
if [ "${glibcfix}" == "yes" ]; then if [ "${glibcfix}" == "yes" ]; then
fn_print_info_nl "Glibc fix: Using Glibc fix" if [ "${function_selfname}" != "command_install.sh" ]; then
echo " * glibc required: ${glibcrequired}" fn_print_info_nl "Glibc fix: Using Glibc fix"
echo " * glibc installed: ${glibcversion}" echo " * glibc required: ${glibcrequired}"
export LD_LIBRARY_PATH=:"${libdir}" echo " * glibc installed: ${glibcversion}"
fix_glibc.sh
fi
else else
fn_print_warn_nl "Glibc fix: No Glibc fix available!" fn_print_warn_nl "Glibc fix: No Glibc fix available!"
echo -en "\n" echo -en "\n"
@ -22,6 +24,7 @@ if [ "$(printf '%s\n'${glibcrequired}'\n' ${glibcversion} | sort -V | head -n 1)
echo " * glibc installed: ${glibcversion}" echo " * glibc installed: ${glibcversion}"
echo -en "\n" echo -en "\n"
fn_print_infomation "The game server will probably not work. A distro upgrade is required!" fn_print_infomation "The game server will probably not work. A distro upgrade is required!"
sleep 5
fi fi
echo -en "\n" echo -en "\n"
fi fi

2
lgsm/functions/fix_glibc.sh

@ -22,4 +22,4 @@ do
fi fi
done done
check_glibc.sh export LD_LIBRARY_PATH=:"${libdir}"
Loading…
Cancel
Save