From a070109080ee48fbf70c5b3b15c45b792d79fbac Mon Sep 17 00:00:00 2001
From: Adriana Draghici <adriana008@gmail.com>
Date: Fri, 27 Nov 2009 16:05:31 +0000
Subject: [PATCH] Tribler: script that merges the 2 status msg files.

---
 log-parser/tribler/StatusParser.py |  2 +-
 tribler-mod/merge_status_msg.sh    | 10 ++++++++++
 2 files changed, 11 insertions(+), 1 deletion(-)
 create mode 100755 tribler-mod/merge_status_msg.sh

diff --git a/log-parser/tribler/StatusParser.py b/log-parser/tribler/StatusParser.py
index 3b2905f..6c592b4 100644
--- a/log-parser/tribler/StatusParser.py
+++ b/log-parser/tribler/StatusParser.py
@@ -13,7 +13,7 @@ DEBUG = True
 files_sizes = {} # dictionary: key - filename, value - filesize
 
 def usage():
-    print "Usage: python StatusParser.py -i|--id id status_file"
+    print "Usage: python StatusParser.py -i|--id id status_file "
     print "id:"
     print "\t--id"
     print "\t-i\t\tclient_session_id"
diff --git a/tribler-mod/merge_status_msg.sh b/tribler-mod/merge_status_msg.sh
new file mode 100755
index 0000000..b01bb40
--- /dev/null
+++ b/tribler-mod/merge_status_msg.sh
@@ -0,0 +1,10 @@
+#!/bin/bash
+
+
+if test $# -lt 2
+	then
+			echo "Usage: $0 <file1> <file2>"
+else
+	cat $1 >> $2
+fi
+
-- 
2.20.1