From: kibergus <kibergus@gmail.com>
Date: Wed, 23 Jun 2010 08:17:49 +0000 (+0000)
Subject: Fixed boot scripts
X-Git-Url: https://vcs.maemo.org/git/?p=ussd-widget;a=commitdiff_plain;h=6c6b10ecc1f4b56e8622e57016f5209c355b7d65

Fixed boot scripts


git-svn-id: file:///svnroot/ussd-widget/trunk@40 d197f4d6-dc93-42ad-8354-0da1f58e353f
---

diff --git a/ussd4all/debian/changelog b/ussd4all/debian/changelog
index 0c5459c..9454445 100644
--- a/ussd4all/debian/changelog
+++ b/ussd4all/debian/changelog
@@ -1,7 +1,5 @@
-ussd4all (0.0.0-1) unstable; urgency=low
+ussd4all (0.0.1-1) unstable; urgency=low
 
-  * Reincarnation of ussd-common with GUI and hack, that disables nokia's USSD
-    implementation
-
- -- Alexey Guseynov <kibergus@gmail.com>  Tue,  8 Jun 2010 17:21:05 +0000
+  * librtcom patcher from Dani Church and fixed event.d script
+ -- Alexey Guseynov <kibergus@gmail.com>  Tue,  23 Jun 2010 11:21:05 +0003
 
diff --git a/ussd4all/debian/postinst b/ussd4all/debian/postinst
index 5489aab..280d3fd 100644
--- a/ussd4all/debian/postinst
+++ b/ussd4all/debian/postinst
@@ -5,7 +5,5 @@ pkill rtcom-call-ui
 
 chmod +s /usr/bin/pnatd
 
-export DISPLAY=:0.0
-exec su user -c "run-standalone.sh /usr/bin/ussdd" &
+start ussdd
 
-dbus-send --system --type=method_call --dest=com.nokia.osso_browser /com/nokia/osso_browser/request com.nokia.osso_browser.load_url string:"http://kibergus.su/ussd4all.php"
diff --git a/ussd4all/debian/postrm b/ussd4all/debian/postrm
index 93a6a7a..b92c88c 100644
--- a/ussd4all/debian/postrm
+++ b/ussd4all/debian/postrm
@@ -2,5 +2,4 @@
 if [ -f /usr/lib/librtcom-call-ui.so.0.0.0.orig ] ; then
     mv /usr/lib/librtcom-call-ui.so.0.0.0.orig /usr/lib/librtcom-call-ui.so.0.0.0
 fi
-pkill ussdd
 return 0
diff --git a/ussd4all/debian/prerm b/ussd4all/debian/prerm
new file mode 100644
index 0000000..4c53d71
--- /dev/null
+++ b/ussd4all/debian/prerm
@@ -0,0 +1,4 @@
+#!/bin/sh
+stop ussdd
+pkill ussdd
+return 0
diff --git a/ussd4all/rtcom/rtcompatcher.py b/ussd4all/rtcom/rtcompatcher.py
index 450defe..9da9731 100644
--- a/ussd4all/rtcom/rtcompatcher.py
+++ b/ussd4all/rtcom/rtcompatcher.py
@@ -73,7 +73,7 @@ class Patcher:
         f.close()
 
 if __name__ == '__main__':
-    import sys, os, shutil
+    import sys, os, shutil, subprocess
 
     library = '/usr/lib/librtcom-call-ui.so.0.0.0'
 
@@ -85,13 +85,17 @@ if __name__ == '__main__':
 
     if not patcher.check_md5sum(library):
         if not patcher.check_data(library):
-            print "Your %s is not recognized. So I won't patch it." % (library,)
-            sys.exit(1)
+            message = "Your %s is not recognized. So I won't patch it." % (library,)
+	    subprocess.call(["dbus-send --type=method_call --dest=org.freedesktop.Notifications /org/freedesktop/Notifications org.freedesktop.Notifications.SystemNoteDialog string:\""+message+"\" uint32:0 string:\"OK\""],shell=True)
+	    print message	
+	    sys.exit(1)
         if len(sys.argv) > 1 and sys.argv[1] == '--force':
-            print "Patching an unrecognized %s. Please test your system before rebooting." % (library,)
+            message = "Patching an unrecognized %s. Please test your system before rebooting." % (library,)
+	    print message	    
         else:
 	    message = "Your %s is not recognized, but it seems to match the patterns.\nRun '%s --force' to try patching anyway, but understand that\nTHIS MAY BREAK YOUR SYSTEM.  If you do, test your system thoroughly before rebooting." % (library,library,sys.argv[0])
 	    subprocess.call(["dbus-send --type=method_call --dest=org.freedesktop.Notifications /org/freedesktop/Notifications org.freedesktop.Notifications.SystemNoteDialog string:\""+message+"\" uint32:0 string:\"OK\""],shell=True)
+	    print message
 	    sys.exit(1)
 
     shutil.copy2(library, library+'.orig')
diff --git a/ussd4all/src/event.d/ussdd b/ussd4all/src/event.d/ussdd
index 39c3c28..2a45c85 100644
--- a/ussd4all/src/event.d/ussdd
+++ b/ussd4all/src/event.d/ussdd
@@ -5,6 +5,6 @@ respawn limit 15 3
 
 script
 	export DISPLAY=:0.0
-        exec su user -c "run-standalone.sh /usr/bin/ussdd"&
+        exec su user -c "run-standalone.sh /usr/bin/ussdd"
 	sleep 5
 end script