Browse Source

tmux will now be detected if compiled from source

#736
pull/981/head
Daniel Gibbs 9 years ago
parent
commit
ed0ddc35f4
  1. 17
      lgsm/functions/check_deps.sh

17
lgsm/functions/check_deps.sh

@ -18,6 +18,11 @@ fn_deps_detector(){
if [ "${depstatus}" == "0" ]; then if [ "${depstatus}" == "0" ]; then
missingdep=0 missingdep=0
if [ "${function_selfname}" == "command_install.sh" ]; then if [ "${function_selfname}" == "command_install.sh" ]; then
if [ "${tmuxcheck}" != "1" ]; then
# Added for users compiling tmux from source to bypass rpm check
echo -e "${green}tmux${default}"
tmuxcheck=1
fi
echo -e "${green}${deptocheck}${default}" echo -e "${green}${deptocheck}${default}"
sleep 0.5 sleep 0.5
fi fi
@ -137,8 +142,12 @@ if [ -n "$(command -v dpkg-query)" ]; then
# All servers except ts3 require tmux # All servers except ts3 require tmux
if [ "${executable}" != "./ts3server_startscript.sh" ]; then if [ "${executable}" != "./ts3server_startscript.sh" ]; then
if [ "$(command -v tmux)" ]||[ "$(which tmux)" ]||[ -f "/usr/bin/tmux" ]||[ -f "/bin/tmux" ]; then
: # Added for users compiling tmux from source to bypass rpm check
else
array_deps_required+=( tmux ) array_deps_required+=( tmux )
fi fi
fi
# All servers except ts3 & mumble require libstdc++6, lib32gcc1 # All servers except ts3 & mumble require libstdc++6, lib32gcc1
if [ "${executable}" != "./ts3server_startscript.sh" ]||[ "${executable}" != "./murmur.x86" ]; then if [ "${executable}" != "./ts3server_startscript.sh" ]||[ "${executable}" != "./murmur.x86" ]; then
@ -184,12 +193,20 @@ elif [ -n "$(command -v yum)" ]; then
array_deps_missing=() array_deps_missing=()
# LGSM requirements # LGSM requirements
if [ "${distroversion}" == "6" ]; then
array_deps_required=( curl util-linux-ng python file )
else
array_deps_required=( curl util-linux python file ) array_deps_required=( curl util-linux python file )
fi
# All servers except ts3 require tmux # All servers except ts3 require tmux
if [ "${executable}" != "./ts3server_startscript.sh" ]; then if [ "${executable}" != "./ts3server_startscript.sh" ]; then
if [ "$(command -v tmux)" ]||[ "$(which tmux)" ]||[ -f "/usr/bin/tmux" ]||[ -f "/bin/tmux" ]; then
: # Added for users compiling tmux from source to bypass rpm check
else
array_deps_required+=( tmux ) array_deps_required+=( tmux )
fi fi
fi
# All servers excelts ts3 & mumble require glibc.i686 libstdc++.i686 # All servers excelts ts3 & mumble require glibc.i686 libstdc++.i686
if [ "${executable}" != "./ts3server_startscript.sh" ]||[ "${executable}" != "./murmur.x86" ]; then if [ "${executable}" != "./ts3server_startscript.sh" ]||[ "${executable}" != "./murmur.x86" ]; then

Loading…
Cancel
Save