From 2ad8b671a24ff019cd893a04b7e126bd5888e62d Mon Sep 17 00:00:00 2001
From: UltimateByte <robin.labadie@gmail.com>
Date: Thu, 11 Aug 2016 15:17:43 +0200
Subject: [PATCH 1/4] Corrected output check from tar command
Was inverted
---
lgsm/functions/command_backup.sh | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/lgsm/functions/command_backup.sh b/lgsm/functions/command_backup.sh
index 4c9a1b39d..ca6fe9607 100644
--- a/lgsm/functions/command_backup.sh
+++ b/lgsm/functions/command_backup.sh
@@ -47,7 +47,7 @@ if [ ! -d "${backupdir}" ]; then
mkdir "${backupdir}"
fi
tar -czf "${backupdir}/${backupname}.tar.gz" -C "${rootdir}" --exclude "backups" ./*
-if [ $? != 0 ]; then
+if [ $? == 0 ]; then
fn_print_ok_nl "Backup created: ${backupname}.tar.gz is $(du -sh "${backupdir}/${backupname}.tar.gz" | awk '{print $1}') size"
fn_script_log_pass "Backup created: ${backupdir}/${backupname}.tar.gz is $(du -sh "${backupdir}/${backupname}.tar.gz" | awk '{print $1}') size"
else
@@ -56,4 +56,4 @@ else
fi
sleep 1
echo ""
-core_exit.sh
\ No newline at end of file
+core_exit.sh
From 9e3148cb2b21ca528bf8090dd8c48a93066273c3 Mon Sep 17 00:00:00 2001
From: UltimateByte <robin.labadie@gmail.com>
Date: Sat, 13 Aug 2016 15:43:12 +0200
Subject: [PATCH 2/4] Removed glibc fix for gmod until fixed
---
lgsm/functions/fix_glibc.sh | 30 +++++++++++++++---------------
1 file changed, 15 insertions(+), 15 deletions(-)
diff --git a/lgsm/functions/fix_glibc.sh b/lgsm/functions/fix_glibc.sh
index 73c2815b8..5a7585c49 100644
--- a/lgsm/functions/fix_glibc.sh
+++ b/lgsm/functions/fix_glibc.sh
@@ -24,20 +24,20 @@ do
fi
done
-local libc_servers_array=( "Garry's Mod" )
-for libc_server in "${libc_servers_array[@]}"
-do
- if [ "${gamename}" == "${libc_server}" ]; then
- fn_fetch_file_github "lgsm/lib/ubuntu12.04/i386" "libc.so.6" "${lgsmdir}/lib" "noexecutecmd" "norun" "noforce" "nomd5"
- fi
-done
+#local libc_servers_array=( "Garry's Mod" )
+#for libc_server in "${libc_servers_array[@]}"
+#do
+# if [ "${gamename}" == "${libc_server}" ]; then
+# fn_fetch_file_github "lgsm/lib/ubuntu12.04/i386" "libc.so.6" "${lgsmdir}/lib" "noexecutecmd" "norun" "noforce" "nomd5"
+# fi
+#done
-local libpthread_servers_array=( "Garry's Mod" )
-for libpthread_server in "${libpthread_servers_array[@]}"
-do
- if [ "${gamename}" == "${libpthread_server}" ]; then
- fn_fetch_file_github "lgsm/lib/ubuntu12.04/i386" "libpthread.so.0" "${lgsmdir}/lib" "noexecutecmd" "norun" "noforce" "nomd5"
- fi
-done
+#local libpthread_servers_array=( "Garry's Mod" )
+#for libpthread_server in "${libpthread_servers_array[@]}"
+#do
+# if [ "${gamename}" == "${libpthread_server}" ]; then
+# fn_fetch_file_github "lgsm/lib/ubuntu12.04/i386" "libpthread.so.0" "${lgsmdir}/lib" "noexecutecmd" "norun" "noforce" "nomd5"
+# fi
+#done
-export LD_LIBRARY_PATH=:"${libdir}"
\ No newline at end of file
+export LD_LIBRARY_PATH=:"${libdir}"
From 317dac85bb396fc64d439025ad1e5159468adea6 Mon Sep 17 00:00:00 2001
From: Daniel Gibbs <me@danielgibbs.co.uk>
Date: Sat, 13 Aug 2016 15:02:55 +0100
Subject: [PATCH 3/4] Revert "Removed glibc fix for gmod until fixed"
This reverts commit 9e3148cb2b21ca528bf8090dd8c48a93066273c3.
---
lgsm/functions/fix_glibc.sh | 30 +++++++++++++++---------------
1 file changed, 15 insertions(+), 15 deletions(-)
diff --git a/lgsm/functions/fix_glibc.sh b/lgsm/functions/fix_glibc.sh
index 5a7585c49..73c2815b8 100644
--- a/lgsm/functions/fix_glibc.sh
+++ b/lgsm/functions/fix_glibc.sh
@@ -24,20 +24,20 @@ do
fi
done
-#local libc_servers_array=( "Garry's Mod" )
-#for libc_server in "${libc_servers_array[@]}"
-#do
-# if [ "${gamename}" == "${libc_server}" ]; then
-# fn_fetch_file_github "lgsm/lib/ubuntu12.04/i386" "libc.so.6" "${lgsmdir}/lib" "noexecutecmd" "norun" "noforce" "nomd5"
-# fi
-#done
+local libc_servers_array=( "Garry's Mod" )
+for libc_server in "${libc_servers_array[@]}"
+do
+ if [ "${gamename}" == "${libc_server}" ]; then
+ fn_fetch_file_github "lgsm/lib/ubuntu12.04/i386" "libc.so.6" "${lgsmdir}/lib" "noexecutecmd" "norun" "noforce" "nomd5"
+ fi
+done
-#local libpthread_servers_array=( "Garry's Mod" )
-#for libpthread_server in "${libpthread_servers_array[@]}"
-#do
-# if [ "${gamename}" == "${libpthread_server}" ]; then
-# fn_fetch_file_github "lgsm/lib/ubuntu12.04/i386" "libpthread.so.0" "${lgsmdir}/lib" "noexecutecmd" "norun" "noforce" "nomd5"
-# fi
-#done
+local libpthread_servers_array=( "Garry's Mod" )
+for libpthread_server in "${libpthread_servers_array[@]}"
+do
+ if [ "${gamename}" == "${libpthread_server}" ]; then
+ fn_fetch_file_github "lgsm/lib/ubuntu12.04/i386" "libpthread.so.0" "${lgsmdir}/lib" "noexecutecmd" "norun" "noforce" "nomd5"
+ fi
+done
-export LD_LIBRARY_PATH=:"${libdir}"
+export LD_LIBRARY_PATH=:"${libdir}"
\ No newline at end of file
From 6c3b6d4c47663c48f93a6870a7c79b0ed2c8ad61 Mon Sep 17 00:00:00 2001
From: UltimateByte <robin.labadie@gmail.com>
Date: Sat, 13 Aug 2016 16:13:16 +0200
Subject: [PATCH 4/4] Removed extra glibc fix
---
lgsm/functions/fix.sh | 4 ----
1 file changed, 4 deletions(-)
diff --git a/lgsm/functions/fix.sh b/lgsm/functions/fix.sh
index 7f27d886c..f31c010d7 100644
--- a/lgsm/functions/fix.sh
+++ b/lgsm/functions/fix.sh
@@ -44,10 +44,6 @@ if [ "${function_selfname}" != "command_install.sh" ]; then
elif [ "${gamename}" == "ARMA 3" ]; then
fix_arma3.sh
fi
-
- if [ "${gamename}" != "TeamSpeak 3" ]; then
- fix_glibc.sh
- fi
fi
# Fixes that are run on install only.