From e29b24de2c8eeb2e8ff4e3758469074e759f695e Mon Sep 17 00:00:00 2001
From: Daniel Gibbs <me@danielgibbs.co.uk>
Date: Sat, 30 Sep 2017 20:29:19 +0100
Subject: [PATCH] Updated SAMP to follow new system

---
 SanAndreasMultiplayer/cfg/lgsm-default.cfg |  17 ---
 SanAndreasMultiplayer/sampserver           | 145 ---------------------
 lgsm/functions/install_config.sh           |  10 +-
 3 files changed, 5 insertions(+), 167 deletions(-)
 delete mode 100644 SanAndreasMultiplayer/cfg/lgsm-default.cfg
 delete mode 100755 SanAndreasMultiplayer/sampserver

diff --git a/SanAndreasMultiplayer/cfg/lgsm-default.cfg b/SanAndreasMultiplayer/cfg/lgsm-default.cfg
deleted file mode 100644
index 1a1922b60..000000000
--- a/SanAndreasMultiplayer/cfg/lgsm-default.cfg
+++ /dev/null
@@ -1,17 +0,0 @@
-echo Executing Server Config...
-lanmode 0
-rcon_password "<rconpassword>"
-maxplayers 50
-port 7777
-hostname "<hostname>"
-gamemode0 grandlarc 1
-filterscripts base gl_actions gl_property gl_realtime
-announce 0
-query 1
-weburl www.sa-mp.com
-maxnpc 0
-onfoot_rate 40
-incar_rate 40
-weapon_rate 40
-stream_distance 300.0
-stream_rate 1000
diff --git a/SanAndreasMultiplayer/sampserver b/SanAndreasMultiplayer/sampserver
deleted file mode 100755
index 6fa9a9165..000000000
--- a/SanAndreasMultiplayer/sampserver
+++ /dev/null
@@ -1,145 +0,0 @@
-#!/bin/bash
-# San Andreas Multiplayer 
-# Server Management Script
-# Author: Daniel Gibbs
-# Website: https://gameservermanagers.com
-if [ -f ".dev-debug" ]; then
-	exec 5>dev-debug.log
-	BASH_XTRACEFD="5"
-	set -x
-fi
-
-version="210516"
-
-#### Variables ####
-
-# Notification Alerts
-# (on|off)
-
-# Email
-emailalert="off"
-email="email@example.com"
-#emailfrom="email@example.com"
-
-# Pushbullet
-# https://www.pushbullet.com/#settings
-pushbulletalert="off"
-pushbullettoken="accesstoken"
-
-# Start Variables
-ip="0.0.0.0"
-port="7777"
-
-fn_parms(){
-parms=" "
-}
-
-#### Advanced Variables ####
-
-# Github Branch Select
-# Allows for the use of different function files
-# from a different repo and/or branch.
-githubuser="dgibbs64"
-githubrepo="linuxgsm"
-githubbranch="master"
-
-# Server Details
-servicename="samp-server"
-gamename="San Andreas Multiplayer"
-engine="RenderWare"
-
-# Directories
-rootdir="$(dirname $(readlink -f "${BASH_SOURCE[0]}"))"
-selfname="$(basename $(readlink -f "${BASH_SOURCE[0]}"))"
-lockselfname=".${servicename}.lock"
-lgsmdir="${rootdir}/lgsm"
-functionsdir="${lgsmdir}/functions"
-libdir="${lgsmdir}/lib"
-tmpdir="${lgsmdir}/tmp"
-filesdir="${rootdir}/serverfiles"
-systemdir="${filesdir}"
-executabledir="${systemdir}/samp03"
-executable="./samp03svr"
-servercfg="server.cfg"
-servercfgdir="${systemdir}/samp03"
-servercfgfullpath="${servercfgdir}/${servercfg}"
-servercfgdefault="${servercfgdir}/lgsm-default.cfg"
-backupdir="${rootdir}/backups"
-
-# Logging
-logdays="7"
-gamelogdir="${filesdir}/Logs"
-scriptlogdir="${rootdir}/log/script"
-consolelogdir="${rootdir}/log/console"
-consolelogging="on"
-
-scriptlog="${scriptlogdir}/${servicename}-script.log"
-consolelog="${consolelogdir}/${servicename}-console.log"
-emaillog="${scriptlogdir}/${servicename}-email.log"
-
-scriptlogdate="${scriptlogdir}/${servicename}-script-$(date '+%d-%m-%Y-%H-%M-%S').log"
-consolelogdate="${consolelogdir}/${servicename}-console-$(date '+%d-%m-%Y-%H-%M-%S').log"
-
-##### Script #####
-# Do not edit
-
-# Fetches core_dl for file downloads
-fn_fetch_core_dl(){
-github_file_url_dir="lgsm/functions"
-github_file_url_name="${functionfile}"
-filedir="${functionsdir}"
-filename="${github_file_url_name}"
-githuburl="https://raw.githubusercontent.com/${githubuser}/${githubrepo}/${githubbranch}/${github_file_url_dir}/${github_file_url_name}"
-# If the file is missing, then download
-if [ ! -f "${filedir}/${filename}" ]; then
-	if [ ! -d "${filedir}" ]; then
-		mkdir -p "${filedir}"
-	fi
-	echo -e "    fetching ${filename}...\c"
-	# Check curl exists and use available path
-	curlpaths="$(command -v curl 2>/dev/null) $(which curl >/dev/null 2>&1) /usr/bin/curl /bin/curl /usr/sbin/curl /sbin/curl)"
-	for curlcmd in ${curlpaths}
-	do
-		if [ -x "${curlcmd}" ]; then
-			break
-		fi
-	done
-	# If curl exists download file
-	if [ "$(basename ${curlcmd})" == "curl" ]; then
-		curlfetch=$(${curlcmd} -s --fail -o "${filedir}/${filename}" "${githuburl}" 2>&1)
-		if [ $? -ne 0 ]; then
-			echo -e "\e[0;31mFAIL\e[0m\n"
-			echo "${curlfetch}"
-			echo -e "${githuburl}\n"
-			exit 1
-		else
-			echo -e "\e[0;32mOK\e[0m"
-		fi
-	else
-		echo -e "\e[0;31mFAIL\e[0m\n"
-		echo "Curl is not installed!"
-		echo -e ""
-		exit 1
-	fi
-	chmod +x "${filedir}/${filename}"
-fi
-source "${filedir}/${filename}"
-}
-
-core_dl.sh(){
-# Functions are defined in core_functions.sh.
-functionfile="${FUNCNAME}"
-fn_fetch_core_dl
-}
-
-core_functions.sh(){
-# Functions are defined in core_functions.sh.
-functionfile="${FUNCNAME}"
-fn_fetch_core_dl
-}
-
-core_dl.sh
-core_functions.sh
-
-getopt=$1
-core_getopt.sh
diff --git a/lgsm/functions/install_config.sh b/lgsm/functions/install_config.sh
index 1340b11e1..62e31e77e 100644
--- a/lgsm/functions/install_config.sh
+++ b/lgsm/functions/install_config.sh
@@ -463,11 +463,11 @@ elif [ "${gamename}" == "Starbound" ]; then
 	fn_default_config_remote
 	fn_set_config_vars
 elif [ "${gamename}" == "San Andreas Multiplayer" ]; then
-	echo -e "downloading server.cfg...\c"
-	wget -N /dev/null  ${githuburl}/SanAndreasMultiplayer/cfg/lgsm-default.cfg 2>&1 | grep -F HTTP | cut -c45- | uniq
-	sleep 1
-	fn_defaultconfig
-	fn_userinputconfig
+	gamedirname="SanAndreasMultiplayer"
+	array_configs+=( server.cfg )
+	fn_fetch_default_config
+	fn_default_config_remote
+	fn_set_config_vars
 elif [ "${gamename}" == "Sven Co-op" ]; then
 	gamedirname="SvenCoop"
 	array_configs+=( server.cfg )