ソースを参照

Merge remote-tracking branch 'refs/remotes/origin/master' into exitcodes

Daniel Gibbs 10 年 前
コミット
94569939a7

+ 5 - 3
lgsm/functions/check_deps.sh

@@ -79,9 +79,11 @@ fn_found_missing_deps(){
 			sleep 1
 			echo -en "   \r"
 			if [ -n "$(command -v dpkg-query)" ]; then
-				echo "sudo dpkg --add-architecture i386; sudo apt-get install ${array_deps_missing[@]}"
+				cmd="sudo dpkg --add-architecture i386; sudo apt-get -y install ${array_deps_missing[@]}"
+				eval $cmd
 			elif [ -n "$(command -v yum)" ]; then
-				echo "yum install ${array_deps_missing[@]}"
+				cmd="sudo yum -y install ${array_deps_missing[@]}"
+				eval $cmd
 			fi
 		else
 			echo ""
@@ -91,7 +93,7 @@ fn_found_missing_deps(){
 			if [ -n "$(command -v dpkg-query)" ]; then
 				echo "sudo dpkg --add-architecture i386; sudo apt-get install ${array_deps_missing[@]}"
 			elif [ -n "$(command -v yum)" ]; then
-				echo "yum install ${array_deps_missing[@]}"
+				echo "sudo yum install ${array_deps_missing[@]}"
 			fi
 			echo ""
 		fi

+ 1 - 3
lgsm/functions/command_validate.sh

@@ -22,9 +22,7 @@ fn_validation(){
 
 	cd "${rootdir}/steamcmd"
 
-        if [ $(command -v unbuffer) ]; then
-		unbuffer=unbuffer
-        elif  [ $(command -v stdbuf) ]; then
+    if  [ $(command -v stdbuf) ]; then
 		unbuffer="stdbuf -i0 -o0 -e0"
 	fi
 

+ 1 - 3
lgsm/functions/install_server_files.sh

@@ -45,9 +45,7 @@ fn_install_server_files_steamcmd(){
 			fi
 
 			# Detects if unbuffer command is available.
-			if [ $(command -v unbuffer) ]; then
-				unbuffer=unbuffer
-                        elif  [ $(command -v stdbuf) ]; then
+            if  [ $(command -v stdbuf) ]; then
 		            unbuffer="stdbuf -i0 -o0 -e0"
 			fi
 

+ 1 - 3
lgsm/functions/update_dl.sh

@@ -14,9 +14,7 @@ fn_steamcmd_dl(){
 	cd "steamcmd"
 
 	# Detects if unbuffer command is available.
-	if [ $(command -v unbuffer) ]; then
-		unbuffer=unbuffer
-        elif  [ $(command -v stdbuf) ]; then
+    if  [ $(command -v stdbuf) ]; then
 		unbuffer="stdbuf -i0 -o0 -e0"
 	fi