[haiku-commits] haiku: hrev46653 - 3rdparty/mmu_man/scripts

  • From: revol@xxxxxxx
  • To: haiku-commits@xxxxxxxxxxxxx
  • Date: Thu, 9 Jan 2014 17:10:23 +0100 (CET)

hrev46653 adds 1 changeset to branch 'master'
old head: f466a0b81edfbe4d979d0617aa154babbb6a783e
new head: 5143323fb69e0c6e6adae3a2e67ce0720e01af56
overview: http://cgit.haiku-os.org/haiku/log/?qt=range&q=5143323+%5Ef466a0b

----------------------------------------------------------------------------

5143323: myupdate: Close and restart Deskbar on update
  
  Close Deskbar before trying to update and restart it afterward.
  This way the addons are restored as they were before.

                                          [ François Revol <revol@xxxxxxx> ]

----------------------------------------------------------------------------

Revision:    hrev46653
Commit:      5143323fb69e0c6e6adae3a2e67ce0720e01af56
URL:         http://cgit.haiku-os.org/haiku/commit/?id=5143323
Author:      François Revol <revol@xxxxxxx>
Date:        Thu Jan  9 16:04:23 2014 UTC

----------------------------------------------------------------------------

1 file changed, 14 insertions(+), 4 deletions(-)
3rdparty/mmu_man/scripts/myupdate.sh | 18 ++++++++++++++----

----------------------------------------------------------------------------

diff --git a/3rdparty/mmu_man/scripts/myupdate.sh 
b/3rdparty/mmu_man/scripts/myupdate.sh
index 5b14779..34d745c 100755
--- a/3rdparty/mmu_man/scripts/myupdate.sh
+++ b/3rdparty/mmu_man/scripts/myupdate.sh
@@ -13,20 +13,31 @@ notice () {
 }
 
 if [ "$1" != "-2" ]; then
+
+       notice "Closing Deskbar..."
        notice "Checking for updates..."
+       quit application/x-vnd.Be-TSKB
+       #notice "Checking for updates..."
        pkgman update || exit $?
        sync
        if [ "$(ls /system/packages/*_hrev*-* | grep -v $(uname -v | cut -d' ' 
-f1))" = "" ]; then
+               open /system/Deskbar < /dev/null > /dev/null 2>&1 &
+               notice "Restarting Deskbar..."
+               notice "Nothing to do"
                read
                exit 0
        fi
        makebootable /boot
+       sync
        cat > $(finddir B_USER_SETTINGS_DIRECTORY)/boot/launch/myupdate2.sh << 
EOF
 #!/bin/sh
 cd "$PWD"
 $0 -2
 EOF
        chmod +x $(finddir B_USER_SETTINGS_DIRECTORY)/boot/launch/myupdate2.sh
+       sync
+       notice "Restarting Deskbar..."
+       /system/Deskbar < /dev/null > /dev/null 2>&1 &
        notice "You should reboot now..."
        shutdown -r -a
        read
@@ -43,10 +54,9 @@ mv $(ls /system/packages/*_hrev*-* | grep -v $(uname -v | 
cut -d' ' -f1)) $disdi
 
 sync
 
-notice "Adding back deskbar addons..."
-
-ProcessController -deskbar
-NetworkStatus --deskbar
+#notice "Adding back deskbar addons..."
+#ProcessController -deskbar
+#NetworkStatus --deskbar
 
 notice "Done"
 


Other related posts:

  • » [haiku-commits] haiku: hrev46653 - 3rdparty/mmu_man/scripts - revol