From 12f6b340e5b09b7506ffcf37f9bcc5e433c74058 Mon Sep 17 00:00:00 2001
From: John Preston <johnprestonmail@gmail.com>
Date: Sun, 18 Jan 2015 15:52:14 +0300
Subject: [PATCH] clearing init logs

---
 Telegram/FixMake.sh           | 40 ++++++++++++++++++-----------------
 Telegram/FixMake32.sh         | 40 ++++++++++++++++++-----------------
 Telegram/SourceFiles/main.cpp |  1 +
 3 files changed, 43 insertions(+), 38 deletions(-)

diff --git a/Telegram/FixMake.sh b/Telegram/FixMake.sh
index 693d69c16..1e14d64f7 100755
--- a/Telegram/FixMake.sh
+++ b/Telegram/FixMake.sh
@@ -1,19 +1,21 @@
-sed -i 's/\-lxcb\-render\-util/\/usr\/lib\/x86_64\-linux\-gnu\/libxcb\-render\-util\.a/g' Makefile
-sed -i 's/\-lxcb\-render/\/usr\/lib\/x86_64\-linux\-gnu\/libxcb\-render\.a/g' Makefile
-sed -i 's/\-lxcb\-sync/\/usr\/lib\/x86_64\-linux\-gnu\/libxcb\-sync\.a/g' Makefile
-sed -i 's/\-lxcb\-keysyms/\/usr\/lib\/x86_64\-linux\-gnu\/libxcb\-keysyms\.a/g' Makefile
-sed -i 's/\-lxcb\-icccm/\/usr\/lib\/x86_64\-linux\-gnu\/libxcb\-icccm\.a/g' Makefile
-sed -i 's/\-lxcb\-xfixes/\/usr\/lib\/x86_64\-linux\-gnu\/libxcb\-xfixes\.a/g' Makefile
-sed -i 's/\-lxcb\-shm/\/usr\/lib\/x86_64\-linux\-gnu\/libxcb\-shm\.a/g' Makefile
-sed -i 's/\-lxcb\-randr/\/usr\/lib\/x86_64\-linux\-gnu\/libxcb\-randr\.a/g' Makefile
-sed -i 's/\-lxcb\-shape/\/usr\/lib\/x86_64\-linux\-gnu\/libxcb\-shape\.a/g' Makefile
-sed -i 's/\-lxcb\-image/\/usr\/lib\/x86_64\-linux\-gnu\/libxcb\-image\.a \/usr\/lib\/x86_64\-linux\-gnu\/libxcb\-util\.a/g' Makefile
-sed -i 's/\-llzma/\/usr\/lib\/x86_64\-linux\-gnu\/liblzma\.a/g' Makefile
-sed -i 's/\-lz/\/usr\/lib\/x86_64\-linux\-gnu\/libz\.a/g' Makefile
-sed -i 's/\-lssl/\/usr\/lib\/x86_64\-linux\-gnu\/libssl\.a/g' Makefile
-sed -i 's/\-lcrypto/\/usr\/lib\/x86_64\-linux\-gnu\/libcrypto\.a/g' Makefile
-sed -i 's/\-lexif/\/usr\/lib\/x86_64\-linux\-gnu\/libexif\.a/g' Makefile
-sed -i 's/\-lopusfile/\/usr\/local\/lib\/libopusfile\.a/g' Makefile
-sed -i 's/\-lopus/\/usr\/local\/lib\/libopus\.a/g' Makefile
-sed -i 's/\-lopenal/\/usr\/local\/lib\/libopenal\.a/g' Makefile
-sed -i 's/\-logg/\/usr\/local\/lib\/libogg\.a/g' Makefile
+Replace () {
+    CheckCommand="grep -ci '$1' Makefile"
+    CheckCount=$(eval $CheckCommand)
+    if [ "$CheckCount" -gt 0 ]; then
+        echo "Requested '$1' to '$2', found - replacing.."
+        ReplaceCommand="sed -i 's/$1/$2/g' Makefile"
+        eval $ReplaceCommand
+    else
+        echo "Skipping '$1' to '$2'"
+    fi
+}
+
+Replace '\-llzma' '\/usr\/lib\/x86_64\-linux\-gnu\/liblzma\.a'
+Replace '\-lz' '\/usr\/lib\/x86_64\-linux\-gnu\/libz\.a'
+Replace '\-lssl' '\/usr\/lib\/x86_64\-linux\-gnu\/libssl\.a'
+Replace '\-lcrypto' '\/usr\/lib\/x86_64\-linux\-gnu\/libcrypto\.a'
+Replace '\-lexif' '\/usr\/lib\/x86_64\-linux\-gnu\/libexif\.a'
+Replace '\-lopusfile' '\/usr\/local\/lib\/libopusfile\.a'
+Replace '\-lopus' '\/usr\/local\/lib\/libopus\.a'
+Replace '\-lopenal' '\/usr\/local\/lib\/libopenal\.a'
+Replace '\-logg' '\/usr\/local\/lib\/libogg\.a'
diff --git a/Telegram/FixMake32.sh b/Telegram/FixMake32.sh
index 10492cc06..936b8de2b 100755
--- a/Telegram/FixMake32.sh
+++ b/Telegram/FixMake32.sh
@@ -1,19 +1,21 @@
-sed -i 's/\-lxcb\-render\-util/\/usr\/lib\/i386\-linux\-gnu\/libxcb\-render\-util\.a/g' Makefile
-sed -i 's/\-lxcb\-render/\/usr\/lib\/i386\-linux\-gnu\/libxcb\-render\.a/g' Makefile
-sed -i 's/\-lxcb\-sync/\/usr\/lib\/i386\-linux\-gnu\/libxcb\-sync\.a/g' Makefile
-sed -i 's/\-lxcb\-keysyms/\/usr\/lib\/i386\-linux\-gnu\/libxcb\-keysyms\.a/g' Makefile
-sed -i 's/\-lxcb\-icccm/\/usr\/lib\/i386\-linux\-gnu\/libxcb\-icccm\.a/g' Makefile
-sed -i 's/\-lxcb\-xfixes/\/usr\/lib\/i386\-linux\-gnu\/libxcb\-xfixes\.a/g' Makefile
-sed -i 's/\-lxcb\-shm/\/usr\/lib\/i386\-linux\-gnu\/libxcb\-shm\.a/g' Makefile
-sed -i 's/\-lxcb\-randr/\/usr\/lib\/i386\-linux\-gnu\/libxcb\-randr\.a/g' Makefile
-sed -i 's/\-lxcb\-shape/\/usr\/lib\/i386\-linux\-gnu\/libxcb\-shape\.a/g' Makefile
-sed -i 's/\-lxcb\-image/\/usr\/lib\/i386\-linux\-gnu\/libxcb\-image\.a \/usr\/lib\/i386\-linux\-gnu\/libxcb\-util\.a/g' Makefile
-sed -i 's/\-llzma/\/usr\/lib\/i386\-linux\-gnu\/liblzma\.a/g' Makefile
-sed -i 's/\-lz/\/usr\/lib\/i386\-linux\-gnu\/libz\.a/g' Makefile
-sed -i 's/\-lssl/\/usr\/lib\/i386\-linux\-gnu\/libssl\.a/g' Makefile
-sed -i 's/\-lcrypto/\/usr\/lib\/i386\-linux\-gnu\/libcrypto\.a/g' Makefile
-sed -i 's/\-lexif/\/usr\/lib\/i386\-linux\-gnu\/libexif\.a/g' Makefile
-sed -i 's/\-lopusfile/\/usr\/local\/lib\/libopusfile\.a/g' Makefile
-sed -i 's/\-lopus/\/usr\/local\/lib\/libopus\.a/g' Makefile
-sed -i 's/\-lopenal/\/usr\/local\/lib\/libopenal\.a/g' Makefile
-sed -i 's/\-logg/\/usr\/local\/lib\/libogg\.a/g' Makefile
+Replace () {
+    CheckCommand="grep -ci '$1' Makefile"
+    CheckCount=$(eval $CheckCommand)
+    if [ "$CheckCount" -gt 0 ]; then
+        echo "Requested '$1' to '$2', found - replacing.."
+        ReplaceCommand="sed -i 's/$1/$2/g' Makefile"
+        eval $ReplaceCommand
+    else
+        echo "Skipping '$1' to '$2'"
+    fi
+}
+
+Replace '\-llzma' '\/usr\/lib\/i386\-linux\-gnu\/liblzma\.a'
+Replace '\-lz' '\/usr\/lib\/i386\-linux\-gnu\/libz\.a'
+Replace '\-lssl' '\/usr\/lib\/i386\-linux\-gnu\/libssl\.a'
+Replace '\-lcrypto' '\/usr\/lib\/i386\-linux\-gnu\/libcrypto\.a'
+Replace '\-lexif' '\/usr\/lib\/i386\-linux\-gnu\/libexif\.a'
+Replace '\-lopusfile' '\/usr\/local\/lib\/libopusfile\.a'
+Replace '\-lopus' '\/usr\/local\/lib\/libopus\.a'
+Replace '\-lopenal' '\/usr\/local\/lib\/libopenal\.a'
+Replace '\-logg' '\/usr\/local\/lib\/libogg\.a'
diff --git a/Telegram/SourceFiles/main.cpp b/Telegram/SourceFiles/main.cpp
index bc2faedb1..68e15b3d1 100644
--- a/Telegram/SourceFiles/main.cpp
+++ b/Telegram/SourceFiles/main.cpp
@@ -51,6 +51,7 @@ int main(int argc, char *argv[]) {
             LOG(("Init Log: %1").arg(logs.at(i)));
         }
     }
+    psClearInitLogs();
 
 	DEBUG_LOG(("Application Info: ideal thread count: %1, using %2 connections per session").arg(QThread::idealThreadCount()).arg(cConnectionsInSession()));