зеркало из https://github.com/mozilla/pjs.git
Bug 533528 - If fennec is running, updates cause profile loss. r=mfinkle
--HG-- extra : rebase_source : cfb3eeab5e2dd09e78815507118adabc8dba363f
This commit is contained in:
Родитель
1d822e04a0
Коммит
9de4d66601
|
@ -67,6 +67,9 @@ install::
|
|||
@echo "Mobile can't be installed directly."
|
||||
@exit 1
|
||||
|
||||
deb: package
|
||||
@$(MAKE) -C mobile/installer deb
|
||||
|
||||
upload::
|
||||
@$(MAKE) -C mobile/installer upload
|
||||
|
||||
|
|
|
@ -110,7 +110,7 @@ debian/control: $(srcdir)/debian/control.in $(LIBXUL_DIST)/bin/platform.ini
|
|||
mkdir -p debian
|
||||
$(PYTHON) $(topsrcdir)/config/Preprocessor.py \
|
||||
$(AUTOMATION_PPARGS) $(DEFINES) $(ACDEFINES) $< > $@
|
||||
|
||||
|
||||
debian/$(MOZ_APP_NAME).desktop: $(srcdir)/debian/$(MOZ_APP_NAME).desktop.in
|
||||
mkdir -p debian
|
||||
$(PYTHON) $(topsrcdir)/config/Preprocessor.py \
|
||||
|
|
|
@ -0,0 +1,26 @@
|
|||
#! /bin/sh
|
||||
|
||||
set -e
|
||||
|
||||
RUNNING=`ps -ax | grep "fennec.*/fennec" | grep -v grep | wc -l`
|
||||
|
||||
if [ $RUNNING -gt 0 ];
|
||||
then
|
||||
dbus-send --system --type=method_call --dest=mozilla.fennec /mozilla/fennec/request mozilla.fennec.quit
|
||||
x=0
|
||||
while [ $x -lt 10 ]
|
||||
do
|
||||
sleep 1
|
||||
RUNNING=`ps -ax | grep "fennec.*/fennec" | grep -v grep | wc -l`
|
||||
|
||||
if [ $RUNNING -eq 0 ];
|
||||
then
|
||||
break
|
||||
fi
|
||||
|
||||
x=`expr $x + 1`
|
||||
done
|
||||
|
||||
pkill -9 fennec
|
||||
sleep 1
|
||||
fi
|
|
@ -0,0 +1,26 @@
|
|||
#! /bin/sh
|
||||
|
||||
set -e
|
||||
|
||||
RUNNING=`ps -ax | grep "fennec.*/fennec" | grep -v grep | wc -l`
|
||||
|
||||
if [ $RUNNING -gt 0 ];
|
||||
then
|
||||
dbus-send --system --type=method_call --dest=mozilla.fennec /mozilla/fennec/request mozilla.fennec.quit
|
||||
x=0
|
||||
while [ $x -lt 10 ]
|
||||
do
|
||||
sleep 1
|
||||
RUNNING=`ps -ax | grep "fennec.*/fennec" | grep -v grep | wc -l`
|
||||
|
||||
if [ $RUNNING -eq 0 ];
|
||||
then
|
||||
break
|
||||
fi
|
||||
|
||||
x=`expr $x + 1`
|
||||
done
|
||||
|
||||
pkill -9 fennec
|
||||
sleep 1
|
||||
fi
|
|
@ -58,4 +58,6 @@ mobile/installer/debian/changelog
|
|||
mobile/installer/debian/compat
|
||||
mobile/installer/debian/files
|
||||
mobile/installer/debian/menu
|
||||
mobile/installer/debian/fennec.preinst
|
||||
mobile/installer/debian/fennec.prerm
|
||||
mobile/installer/debian/fennec.postinst"
|
||||
|
|
Загрузка…
Ссылка в новой задаче