Merge branch 'refs/heads/dgibbs64-master' into pr/1

# Conflicts:
#	CounterStrikeGlobalOffensive/csgoserver
#	lgsm/functions/install_logs.sh

CounterStrikeGlobalOffensive/csgoserver

@@ -29,6 +29,9 @@ pushbullettoken="accesstoken"
 steamuser="anonymous"
 steampass=""
 
+# Token - Get one from http://steamcommunity.com/dev/managegameservers
+token=""
+
 # Start Variables
 # https://developer.valvesoftware.com/wiki/Counter-Strike:_Global_Offensive_Dedicated_Servers#Starting_the_Server
 # [Game Modes]           gametype    gamemode
@@ -63,7 +66,11 @@ gslt=""
 
 # https://developer.valvesoftware.com/wiki/Command_Line_Options#Source_Dedicated_Server
 fn_parms(){
+<<<<<<< HEAD
 parms="-game csgo -usercon -strictportbind -ip ${ip} -port ${port} +clientport ${clientport} +tv_port ${sourcetvport} +sv_setsteamaccount ${gslt} -tickrate ${tickrate} +map ${defaultmap} +servercfgfile ${servercfg} -maxplayers_override ${maxplayers} +mapgroup ${mapgroup} +game_mode ${gamemode} +game_type ${gametype} +host_workshop_collection ${ws_collection_id} +workshop_start_map ${ws_start_map} -authkey ${authkey}"
+=======
+parms="-game csgo -usercon -strictportbind -ip ${ip} -port ${port} +sv_setsteamaccount "${token}" +clientport ${clientport} +tv_port ${sourcetvport} -tickrate ${tickrate} +map ${defaultmap} +servercfgfile ${servercfg} -maxplayers_override ${maxplayers} +mapgroup ${mapgroup} +game_mode ${gamemode} +game_type ${gametype} +host_workshop_collection ${ws_collection_id} +workshop_start_map ${ws_start_map} -authkey ${authkey}"
+>>>>>>> refs/heads/dgibbs64-master
 }
 
 #### Advanced Variables ####

lgsm/functions/install_logs.sh

@@ -13,12 +13,16 @@ if [ "${checklogs}" != "1" ]; then
 fi
 sleep 1
 # Create dir's for the script and console logs
-mkdir -v "${rootdir}/log"
-mkdir -v "${scriptlogdir}"
-touch "${scriptlog}"
-if [ -n "${consolelogdir}" ]; then
+if [ -d "${rootdir}/log" ]; then
+	fn_print_warning_nl "Log folders already exist!"
+else
+	mkdir -v "${rootdir}/log"
+	mkdir -v "${scriptlogdir}"
+	touch "${scriptlog}"
+	if [ -n "${consolelogdir}" ]; then
 		mkdir -v "${consolelogdir}"
 		touch "${consolelog}"
+	fi
 fi
 
 # If a server is source or goldsource, Teamspeak 3, Starbound, Project Zomhoid create a symbolic link to the game server logs.
@@ -40,4 +44,7 @@ if [ -d "${rootdir}/Steam/logs" ]; then
 	fi
 fi
 sleep 1
+<<<<<<< HEAD:lgsm/functions/install_logs.sh
 fn_scriptlog "logs installed"
+=======
+>>>>>>> refs/heads/dgibbs64-master:functions/fn_install_logs