From 33a1839a62763403a242c40fe957eb70f056bde2 Mon Sep 17 00:00:00 2001
From: Daniel Gibbs <me@danielgibbs.co.uk>
Date: Sun, 21 Jun 2015 18:42:28 +0100
Subject: [PATCH] code improvements
---
functions/fn_deps_detect | 92 ++++++++++++++++++++--------------------
1 file changed, 46 insertions(+), 46 deletions(-)
diff --git a/functions/fn_deps_detect b/functions/fn_deps_detect
index f4dfd73c8..fdfcae17b 100644
--- a/functions/fn_deps_detect
+++ b/functions/fn_deps_detect
@@ -9,7 +9,7 @@
local modulename="Backup"
fn_check_root
fn_check_systemdir
-cd ${executabledir}
+cd "${executabledir}"
if [ "${executable}" == "./hlds_run" ];then
executable=hlds_linux
elif [ "${executable}" == "./srcds_run" ]||[ "${executable}" == "./dabds.sh" ]||[ "${executable}" == "./srcds_run.sh" ];then
@@ -21,7 +21,7 @@ elif [ "${executable}" == "./runSam3_DedicatedServer.sh" ];then
elif [ "${executable}" == "./7DaysToDie.sh" ];then
executable=7DaysToDie.x86
elif [ "${executable}" == "./ucc-bin" ];then
-
+
if [ -f "${executabledir}/ucc-bin-real" ]; then
executable=ucc-bin-real
elif [ -f "${executabledir}/ut2004-bin" ]; then
@@ -29,55 +29,55 @@ elif [ "${executable}" == "./ucc-bin" ];then
else
executable=ut-bin
fi
-
+
elif [ "${executable}" == "./ts3server_startscript.sh" ];then
- executable=ts3server_linux_amd64
+
fi
-readelf -d ${executable} |grep NEEDED|awk '{ print $5 }'|sed 's/\[//g'|sed 's/\]//g' > ${rootdir}/.depdetect_readelf
+readelf -d ${executable} |grep NEEDED|awk '{ print $5 }'|sed 's/\[//g'|sed 's/\]//g' > "${rootdir}/.depdetect_readelf"
-echo "yum install " > ${rootdir}/.depdetect_centos_list_uniq
-echo "apt-get install " > ${rootdir}/.depdetect_ubuntu_list_uniq
-echo "apt-get install " > ${rootdir}/.depdetect_debian_list_uniq
+echo "yum install " > "${rootdir}/.depdetect_centos_list_uniq"
+echo "apt-get install " > "${rootdir}/.depdetect_ubuntu_list_uniq"
+echo "apt-get install " > "${rootdir}/.depdetect_debian_list_uniq"
while read lib; do
sharedlib=${lib}
- if [ "${lib}" == "libm.so.6" ]||[ ${lib} == "libc.so.6" ]||[ ${lib} == "libpthread.so.0" ]||[ ${lib} == "libdl.so.2" ]||[ ${lib} == "libnsl.so.1" ]||[ "${lib}" == "libgcc_s.so.1" ]||[ "${lib}" == "librt.so.1" ]||[ "${lib}" == "ld-linux.so.2" ];then
- echo "glibc.i686" >> ${rootdir}/.depdetect_centos_list
- echo "lib32gcc1" >> ${rootdir}/.depdetect_ubuntu_list
- echo "lib32gcc1" >> ${rootdir}/.depdetect_debian_list
+ if [ "${lib}" == "libm.so.6" ]||[ "${lib}" == "libc.so.6" ]||[ "${lib}" == "libpthread.so.0" ]||[ "${lib}" == "libdl.so.2" ]||[ "${lib}" == "libnsl.so.1" ]||[ "${lib}" == "libgcc_s.so.1" ]||[ "${lib}" == "librt.so.1" ]||[ "${lib}" == "ld-linux.so.2" ];then
+ echo "glibc.i686" >> "${rootdir}/.depdetect_centos_list"
+ echo "lib32gcc1" >> "${rootdir}/.depdetect_ubuntu_list"
+ echo "lib32gcc1" >> "${rootdir}/.depdetect_debian_list"
elif [ "${lib}" == "libstdc++.so.6" ];then
- echo "libstdc++.i686" >> ${rootdir}/.depdetect_centos_list
- echo "libstdc++6:i386" >> ${rootdir}/.depdetect_ubuntu_list
- echo "libstdc++6:i386" >> ${rootdir}/.depdetect_debian_list
+ echo "libstdc++.i686" >> "${rootdir}/.depdetect_centos_list"
+ echo "libstdc++6:i386" >> "${rootdir}/.depdetect_ubuntu_list"
+ echo "libstdc++6:i386" >> "${rootdir}/.depdetect_debian_list"
elif [ "${lib}" == "libstdc++.so.5" ];then
- echo "compat-libstdc++-33.i686" >> ${rootdir}/.depdetect_centos_list
- echo "libstdc++5:i386" >> ${rootdir}/.depdetect_ubuntu_list
- echo "libstdc++5:i386" >> ${rootdir}/.depdetect_debian_list
+ echo "compat-libstdc++-33.i686" >> "${rootdir}/.depdetect_centos_list"
+ echo "libstdc++5:i386" >> "${rootdir}/.depdetect_ubuntu_list"
+ echo "libstdc++5:i386" >> "${rootdir}/.depdetect_debian_list"
elif [ "${lib}" == "libspeex.so.1" ]||[ "${lib}" == "libspeexdsp.so.1" ];then
- echo "speex.i686" >> ${rootdir}/.depdetect_centos_list
- echo "speex:i386" >> ${rootdir}/.depdetect_ubuntu_list
- echo "speex:i386" >> ${rootdir}/.depdetect_debian_list
+ echo "speex.i686" >> "${rootdir}/.depdetect_centos_list"
+ echo "speex:i386" >> "${rootdir}/.depdetect_ubuntu_list"
+ echo "speex:i386" >> "${rootdir}/.depdetect_debian_list"
elif [ "${lib}" == "libtier0.so" ]||[ "${lib}" == "Core.so" ]||[ "${lib}" == "Editor.so" ]||[ "${lib}" == "Engine.so" ]||[ "${lib}" == "liblua.so" ]||[ "${lib}" == "libsteam_api.so" ]||[ "${lib}" == "ld-linux-x86-64.so.2" ];then
# Known shared libs what dont requires dependencies
:
else
unknownlib=1
- echo "${lib}" >> ${rootdir}/.depdetect_unknown
+ echo "${lib}" >> "${rootdir}/.depdetect_unknown"
fi
-done < ${rootdir}/.depdetect_readelf
-sort ${rootdir}/.depdetect_centos_list | uniq >> ${rootdir}/.depdetect_centos_list_uniq
-sort ${rootdir}/.depdetect_ubuntu_list | uniq >> ${rootdir}/.depdetect_ubuntu_list_uniq
-sort ${rootdir}/.depdetect_debian_list | uniq >> ${rootdir}/.depdetect_debian_list_uniq
+done < "${rootdir}/.depdetect_readelf"
+sort "${rootdir}/.depdetect_centos_list" | uniq >> "${rootdir}/.depdetect_centos_list_uniq"
+sort "${rootdir}/.depdetect_ubuntu_list" | uniq >> "${rootdir}/.depdetect_ubuntu_list_uniq"
+sort "${rootdir}/.depdetect_debian_list" | uniq >> "${rootdir}/.depdetect_debian_list_uniq"
if [ "${unknownlib}" == "1" ];then
- sort ${rootdir}/.depdetect_unknown | uniq >> ${rootdir}/.depdetect_unknown_uniq
+ sort "${rootdir}/.depdetect_unknown" | uniq >> "${rootdir}/.depdetect_unknown_uniq"
fi
-awk -vORS=' ' '{ print $1, $2 }' ${rootdir}/.depdetect_centos_list_uniq > ${rootdir}/.depdetect_centos_line
-awk -vORS=' ' '{ print $1, $2 }' ${rootdir}/.depdetect_ubuntu_list_uniq > ${rootdir}/.depdetect_ubuntu_line
-awk -vORS=' ' '{ print $1, $2 }' ${rootdir}/.depdetect_debian_list_uniq > ${rootdir}/.depdetect_debian_line
+awk -vORS=' ' '{ print $1, $2 }' "${rootdir}/.depdetect_centos_list_uniq" > "${rootdir}/.depdetect_centos_line"
+awk -vORS=' ' '{ print $1, $2 }' "${rootdir}/.depdetect_ubuntu_list_uniq" > "${rootdir}/.depdetect_ubuntu_line"
+awk -vORS=' ' '{ print $1, $2 }' "${rootdir}/.depdetect_debian_list_uniq" > "${rootdir}/.depdetect_debian_line"
echo ""
echo "Required Dependencies"
@@ -86,38 +86,38 @@ echo "${executable}"
echo ""
echo "CentOS"
echo "================================="
-cat ${rootdir}/.depdetect_centos_line
+cat "${rootdir}/.depdetect_centos_line"
echo ""
echo ""
echo "Ubuntu"
echo "================================="
-cat ${rootdir}/.depdetect_ubuntu_line
+cat "${rootdir}/.depdetect_ubuntu_line"
echo ""
echo ""
echo "Debian"
echo "================================="
-cat ${rootdir}/.depdetect_debian_line
+cat "${rootdir}/.depdetect_debian_line"
echo ""
if [ "${unknownlib}" == "1" ];then
echo ""
echo "Unknown shared Library"
echo "================================="
- cat ${rootdir}/.depdetect_unknown
+ cat "${rootdir}/.depdetect_unknown"
fi
echo ""
echo "Required Librarys"
echo "================================="
-sort ${rootdir}/.depdetect_readelf |uniq
+sort "${rootdir}/.depdetect_readelf" |uniq
echo -en "\n"
-rm -f ${rootdir}/.depdetect_centos_line
-rm -f ${rootdir}/.depdetect_centos_list
-rm -f ${rootdir}/.depdetect_centos_list
-rm -f ${rootdir}/.depdetect_centos_list_uniq
-rm -f ${rootdir}/.depdetect_debian_list
-rm -f ${rootdir}/.depdetect_debian_list_uniq
-rm -f ${rootdir}/.depdetect_readelf
-rm -f ${rootdir}/.depdetect_ubuntu_list
-rm -f ${rootdir}/.depdetect_ubuntu_list_uniq
-rm -f ${rootdir}/.depdetect_unknown
-rm -f ${rootdir}/.depdetect_unknown_uniq
\ No newline at end of file
+rm -f "${rootdir}/.depdetect_centos_line"
+rm -f "${rootdir}/.depdetect_centos_list"
+rm -f "${rootdir}/.depdetect_centos_list"
+rm -f "${rootdir}/.depdetect_centos_list_uniq"
+rm -f "${rootdir}/.depdetect_debian_list"
+rm -f "${rootdir}/.depdetect_debian_list_uniq"
+rm -f "${rootdir}/.depdetect_readelf"
+rm -f "${rootdir}/.depdetect_ubuntu_list"
+rm -f "${rootdir}/.depdetect_ubuntu_list_uniq"
+rm -f "${rootdir}/.depdetect_unknown"
+rm -f "${rootdir}/.depdetect_unknown_uniq"
\ No newline at end of file