소스 검색

typo in starter scripts, checking q2admin compil.

Paul Klumpp 12 년 전
부모
커밋
4149d59f3d
6개의 변경된 파일34개의 추가작업 그리고 12개의 파일을 삭제
  1. 22 8
      q2compile/make_and_put_all.sh
  2. 1 1
      q2srv/action/aq2_1.cfg
  3. 1 1
      q2srv/action/aq2_2.cfg
  4. 1 1
      q2srv/action/aq2_3.cfg
  5. 8 0
      q2srv/action/h_passwords.cfg
  6. 1 1
      q2srv/gs_starter.cfg

+ 22 - 8
q2compile/make_and_put_all.sh

@@ -35,13 +35,13 @@ echo
 read
 read
 
 
 
 
-repo[1]="aq2-tng"
-url[1]="https://github.com/hifi/aq2-tng.git"
-makeit[1]="cd source && pwd && make clean && make"
+repo[1]="q2admin"
+url[1]="https://github.com/hifi/q2admin.git"
+makeit[1]="make clean && make"
 
 
-repo[2]="q2admin"
-url[2]="https://github.com/hifi/q2admin.git"
-makeit[2]="make clean && make"
+repo[2]="aq2-tng"
+url[2]="https://github.com/hifi/aq2-tng.git"
+makeit[2]="cd source && pwd && make clean && make"
 
 
 repo[3]="q2a_mvd"
 repo[3]="q2a_mvd"
 url[3]="git://b4r.org/q2a_mvd"
 url[3]="git://b4r.org/q2a_mvd"
@@ -90,8 +90,22 @@ for idx in ${!repo[*]}; do
 			cp -vr tng/ $q2srv/action/
 			cp -vr tng/ $q2srv/action/
 		;;
 		;;
 		q2admin)
 		q2admin)
-			cp -v game$ARCH.so $q2srv/action/game$ARCH.so
-			cp -vr plugins/ $q2srv/
+			if [ -f "game$ARCH.so" ]; then
+				cp -v game$ARCH.so $q2srv/action/game$ARCH.so
+				cp -vr plugins/ $q2srv/
+			else
+				echo "W0000000t .. q2admin did not compile. Something was wrong."
+				echo "It is most possible because Lua5.1 is missing."
+				echo
+				echo "If you are on Debian or Ubuntu, please try to install the following"
+				echo "package server wide: liblua5.1-0-dev"
+				echo
+				echo "To do that, try: 'sudo apt-get install liblua5.1-0-dev'"
+				echo
+				echo "Then start this script again."
+				echo
+				return 0
+			fi
 		;;
 		;;
 		q2a_mvd)
 		q2a_mvd)
 			cp mvd.lua $q2srv/plugins/
 			cp mvd.lua $q2srv/plugins/

+ 1 - 1
q2srv/action/aq2_1.cfg

@@ -9,7 +9,7 @@
 // General Settings
 // General Settings
 //-----------------------------------------------------------------------------
 //-----------------------------------------------------------------------------
 set hostname "Change Me #1 - teamplay"
 set hostname "Change Me #1 - teamplay"
-sets _admin "change_me #channame irc.quakenet.org, mail@mailme.org"
+sets _admin "change_me #chan irc.quakenet.org"
 
 
 exec h_master.cfg
 exec h_master.cfg
 exec h_passwords.cfg
 exec h_passwords.cfg

+ 1 - 1
q2srv/action/aq2_2.cfg

@@ -9,7 +9,7 @@
 // General Settings
 // General Settings
 //-----------------------------------------------------------------------------
 //-----------------------------------------------------------------------------
 set hostname "Change Me #2 - match 1"
 set hostname "Change Me #2 - match 1"
-sets _admin "change_me #channame irc.quakenet.org, mail@mailme.org"
+sets _admin "change_me #chan irc.quakenet.org"
 
 
 exec h_master.cfg
 exec h_master.cfg
 exec h_passwords.cfg
 exec h_passwords.cfg

+ 1 - 1
q2srv/action/aq2_3.cfg

@@ -9,7 +9,7 @@
 // General Settings
 // General Settings
 //-----------------------------------------------------------------------------
 //-----------------------------------------------------------------------------
 set hostname "Change Me #3 - match 2"
 set hostname "Change Me #3 - match 2"
-sets _admin "change_me #channame irc.quakenet.org, mail@mailme.org"
+sets _admin "change_me #chan irc.quakenet.org"
 
 
 exec h_master.cfg
 exec h_master.cfg
 exec h_passwords.cfg
 exec h_passwords.cfg

+ 8 - 0
q2srv/action/h_passwords.cfg

@@ -1,2 +1,10 @@
+
+
+// rcon_password - so you can change things on the fly while connected with your q2 client
 set rcon_password ""
 set rcon_password ""
+
+// server entry password .. set to "none" if none should be needed to enter your server
 set password "none"
 set password "none"
+
+// Multi View access for a GTV server. With this password, a GTV server can connect to your server to relay-stream the running game. See also h_q2proded.cfg
+set sv_mvd_password "m00ma4"   // CHANGE

+ 1 - 1
q2srv/gs_starter.cfg

@@ -9,7 +9,7 @@ ACTIVATE=(1 2 3)
 PREFIX="gs"
 PREFIX="gs"
 
 
 # put common settings here:
 # put common settings here:
-p_base="+set basedir . +fs_restart +exec q2proded.cfg"
+p_base="+set basedir . +fs_restart +exec h_q2proded.cfg"
 p_action="$p_base +set game action +set gamedir action"
 p_action="$p_base +set game action +set gamedir action"
 
 
 p_q2apub="+set q2a_config q2a_pub.lua"
 p_q2apub="+set q2a_config q2a_pub.lua"