From 7cf9f88210e5aa063a9472d8365e8c74a0e31efd Mon Sep 17 00:00:00 2001
From: Daniel Gibbs <me@danielgibbs.co.uk>
Date: Sat, 20 Feb 2016 00:49:20 +0000
Subject: [PATCH] adding extraction feature

---
 functions/check_steamcmd.sh |  6 ++----
 functions/core_dl.sh        | 40 ++++++++++++++++++++++++++++---------
 2 files changed, 33 insertions(+), 13 deletions(-)

diff --git a/functions/check_steamcmd.sh b/functions/check_steamcmd.sh
index 4c65ec557..d62d5e249 100644
--- a/functions/check_steamcmd.sh
+++ b/functions/check_steamcmd.sh
@@ -12,11 +12,9 @@ echo "Installing steamCMD"
 if [ ! -d "${steamcmddir}" ]; then
 	mkdir -v "${steamcmddir}"
 fi
-fn_fetch_file "http://media.steampowered.com/client/steamcmd_linux.tar.gz" "${steamcmddir}" "steamcmd_linux.tar.gz"
-tar --verbose -zxf "${steamcmddir}/steamcmd_linux.tar.gz" -C "${steamcmddir}"
-rm -v "${steamcmddir}/steamcmd_linux.tar.gz"
+fn_fetch_file "http://media.steampowered.com/client/steamcmd_linux.tar.gz" "${lgsmdir}/tmp" "steamcmd_linux.tar.gz"
+fn_dl_extract "${lgsmdir}/tmp" "steamcmd_linux.tar.gz" "${steamcmddir}"
 chmod +x "${steamcmddir}/steamcmd.sh"
-echo ""
 }
 
 
diff --git a/functions/core_dl.sh b/functions/core_dl.sh
index 1a54b8714..e2b1c61b6 100644
--- a/functions/core_dl.sh
+++ b/functions/core_dl.sh
@@ -34,8 +34,26 @@ fi
 }
 
 fn_dl_extract(){
+filedir=${1}
+filename=${2}
+extractdir=${3}
 # extracts archives
-:
+echo -ne "extracting ${filename}..."
+mime=$(file -b --mime-type "${filedir}/${filename}")
+
+if [ "${mime}" == "application/gzip" ]; then
+	tarcmd=$(tar -zxf "${filedir}/${filename}" -C "${extractdir}")
+elif [ "${mime}" == "application/x-bzip2" ]; then
+	tarcmd=$(tar -jxf "${filedir}/${filename}" -C "${extractdir}")
+fi
+local exitcode=$?
+if [ ${exitcode} -ne 0 ]; then
+	fn_printfaileol
+	echo "${tarcmd}"
+	exit ${exitcode}
+else
+	fn_printokeol
+fi
 }
 
 # Trap to remove file download if canceled before completed
@@ -62,7 +80,7 @@ if [ ! -f "${filedir}/${filename}" ]; then
 	if [ ! -d "${filedir}" ]; then
 		mkdir -p "${filedir}"
 	fi
-	echo -ne "    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 $(echo $PATH | sed "s/\([:]\|\$\)/\/curl /g")"
 	for curlcmd in ${curlpaths}
@@ -78,15 +96,20 @@ if [ ! -f "${filedir}/${filename}" ]; then
 
 		# if larger file shows progress bar
 		if [[ $filename == *"tar"* ]]; then
-			curlfetch=$(${curlcmd} --progress-bar --fail -o "${filedir}/${filename}" "${fileurl}")
-		else	
-			curlfetch=$(${curlcmd} -s --fail -o "${filedir}/${filename}" "${fileurl}" 2>&1)
+			echo -ne "downloading ${filename}..."
+			sleep 1
+			curlcmd=$(${curlcmd} --progress-bar --fail -o "${filedir}/${filename}" "${fileurl}")
+			echo -ne "downloading ${filename}..."
+		else
+			echo -ne "    fetching ${filename}...\c"
+			curlcmd=$(${curlcmd} -s --fail -o "${filedir}/${filename}" "${fileurl}" 2>&1)
 		fi
-		if [ $? -ne 0 ]; then
+		local exitcode=$?
+		if [ ${exitcode} -ne 0 ]; then
 			fn_printfaileol
-			echo "${curlfetch}"
+			echo "${curlcmd}"
 			echo -e "${fileurl}\n"
-			exit 1
+			exit ${exitcode}
 		else
 			fn_printokeol
 		fi
@@ -99,7 +122,6 @@ if [ ! -f "${filedir}/${filename}" ]; then
 		exit 1
 	fi
 	fn_dl_md5
-
 	# make file executable if run is set
 	if [ "${run}" == "run" ]; then
 		chmod +x "${filedir}/${filename}"