From e40cd26b2367ab39de288a98733ebd0f633e706e Mon Sep 17 00:00:00 2001 From: "ajschult%verizon.net" Date: Sat, 23 Jun 2007 05:30:30 +0000 Subject: [PATCH] Bug 384714: Purge moz_pis_startstop_scripts from the tree, r=bsmedberg git-svn-id: svn://10.0.0.236/trunk@228621 18797224-902f-48f8-a5cc-f745e15eee43 --- mozilla/browser/app/mozilla.in | 48 +------------------------ mozilla/calendar/sunbird/app/mozilla.in | 46 ------------------------ mozilla/mail/app/mozilla.in | 48 +------------------------ mozilla/suite/app/seamonkey.in | 48 +------------------------ 4 files changed, 3 insertions(+), 187 deletions(-) diff --git a/mozilla/browser/app/mozilla.in b/mozilla/browser/app/mozilla.in index 55feca733e0..f7a88c0feff 100755 --- a/mozilla/browser/app/mozilla.in +++ b/mozilla/browser/app/mozilla.in @@ -36,7 +36,7 @@ # # ***** END LICENSE BLOCK ***** -## $Id: mozilla.in,v 1.13 2005-09-20 21:11:34 dbaron%dbaron.org Exp $ +## $Id: mozilla.in,v 1.14 2007-06-23 05:30:29 ajschult%verizon.net Exp $ ## ## Usage: ## @@ -49,46 +49,6 @@ ## the mozilla-bin binary to work. ## -moz_pis_startstop_scripts() -{ - MOZ_USER_DIR="%MOZ_USER_DIR%" - # MOZ_PIS_ is the name space for "Mozilla Plugable Init Scripts" - # These variables and there meaning are specified in - # mozilla/xpfe/bootstrap/init.d/README - MOZ_PIS_API=2 - MOZ_PIS_MOZBINDIR="${dist_bin}" - MOZ_PIS_SESSION_PID="$$" - MOZ_PIS_USER_DIR="${MOZ_USER_DIR}" - export MOZ_PIS_API MOZ_PIS_MOZBINDIR MOZ_PIS_SESSION_PID MOZ_PIS_USER_DIR - - case "${1}" in - "start") - for curr_pis in "${dist_bin}/init.d"/S* "${HOME}/${MOZ_USER_DIR}/init.d"/S* ; do - if [ -x "${curr_pis}" ] ; then - case "${curr_pis}" in - *.sh) . "${curr_pis}" ;; - *) "${curr_pis}" "start" ;; - esac - fi - done - ;; - "stop") - for curr_pis in "${HOME}/${MOZ_USER_DIR}/init.d"/K* "${dist_bin}/init.d"/K* ; do - if [ -x "${curr_pis}" ] ; then - case "${curr_pis}" in - *.sh) . "${curr_pis}" ;; - *) "${curr_pis}" "stop" ;; - esac - fi - done - ;; - *) - echo 1>&2 "$0: Internal error in moz_pis_startstop_scripts." - exit 1 - ;; - esac -} - #uncomment for debugging #set -x @@ -173,9 +133,6 @@ done export MRE_HOME -## Start addon scripts -moz_pis_startstop_scripts "start" - if [ $debugging = 1 ] then echo $dist_bin/run-mozilla.sh $script_args $dist_bin/$MOZILLA_BIN "$@" @@ -183,8 +140,5 @@ fi "$dist_bin/run-mozilla.sh" $script_args "$dist_bin/$MOZILLA_BIN" "$@" exitcode=$? -## Stop addon scripts -moz_pis_startstop_scripts "stop" - exit $exitcode # EOF. diff --git a/mozilla/calendar/sunbird/app/mozilla.in b/mozilla/calendar/sunbird/app/mozilla.in index 6161d86897c..94c2b81243f 100755 --- a/mozilla/calendar/sunbird/app/mozilla.in +++ b/mozilla/calendar/sunbird/app/mozilla.in @@ -48,46 +48,6 @@ ## the mozilla-bin binary to work. ## -moz_pis_startstop_scripts() -{ - MOZ_USER_DIR="%MOZ_USER_DIR%" - # MOZ_PIS_ is the name space for "Mozilla Plugable Init Scripts" - # These variables and there meaning are specified in - # mozilla/xpfe/bootstrap/init.d/README - MOZ_PIS_API=2 - MOZ_PIS_MOZBINDIR="${dist_bin}" - MOZ_PIS_SESSION_PID="$$" - MOZ_PIS_USER_DIR="${MOZ_USER_DIR}" - export MOZ_PIS_API MOZ_PIS_MOZBINDIR MOZ_PIS_SESSION_PID MOZ_PIS_USER_DIR - - case "${1}" in - "start") - for curr_pis in "${dist_bin}/init.d"/S* "${HOME}/${MOZ_USER_DIR}/init.d"/S* ; do - if [ -x "${curr_pis}" ] ; then - case "${curr_pis}" in - *.sh) . "${curr_pis}" ;; - *) "${curr_pis}" "start" ;; - esac - fi - done - ;; - "stop") - for curr_pis in "${HOME}/${MOZ_USER_DIR}/init.d"/K* "${dist_bin}/init.d"/K* ; do - if [ -x "${curr_pis}" ] ; then - case "${curr_pis}" in - *.sh) . "${curr_pis}" ;; - *) "${curr_pis}" "stop" ;; - esac - fi - done - ;; - *) - echo 1>&2 "$0: Internal error in moz_pis_startstop_scripts." - exit 1 - ;; - esac -} - #uncomment for debugging #set -x @@ -249,9 +209,6 @@ done export MRE_HOME -## Start addon scripts -moz_pis_startstop_scripts "start" - if [ $debugging = 1 ] then echo $dist_bin/run-mozilla.sh $script_args $dist_bin/$MOZILLA_BIN "$@" @@ -259,8 +216,5 @@ fi "$dist_bin/run-mozilla.sh" $script_args "$dist_bin/$MOZILLA_BIN" "$@" exitcode=$? -## Stop addon scripts -moz_pis_startstop_scripts "stop" - exit $exitcode # EOF. diff --git a/mozilla/mail/app/mozilla.in b/mozilla/mail/app/mozilla.in index 90fa806db57..3a4d2112a64 100644 --- a/mozilla/mail/app/mozilla.in +++ b/mozilla/mail/app/mozilla.in @@ -36,7 +36,7 @@ # # ***** END LICENSE BLOCK ***** -## $Id: mozilla.in,v 1.6 2005-09-20 21:11:35 dbaron%dbaron.org Exp $ +## $Id: mozilla.in,v 1.7 2007-06-23 05:30:30 ajschult%verizon.net Exp $ ## ## Usage: ## @@ -49,46 +49,6 @@ ## the mozilla-bin binary to work. ## -moz_pis_startstop_scripts() -{ - MOZ_USER_DIR="%MOZ_USER_DIR%" - # MOZ_PIS_ is the name space for "Mozilla Plugable Init Scripts" - # These variables and there meaning are specified in - # mozilla/xpfe/bootstrap/init.d/README - MOZ_PIS_API=2 - MOZ_PIS_MOZBINDIR="${dist_bin}" - MOZ_PIS_SESSION_PID="$$" - MOZ_PIS_USER_DIR="${MOZ_USER_DIR}" - export MOZ_PIS_API MOZ_PIS_MOZBINDIR MOZ_PIS_SESSION_PID MOZ_PIS_USER_DIR - - case "${1}" in - "start") - for curr_pis in "${dist_bin}/init.d"/S* "${HOME}/${MOZ_USER_DIR}/init.d"/S* ; do - if [ -x "${curr_pis}" ] ; then - case "${curr_pis}" in - *.sh) . "${curr_pis}" ;; - *) "${curr_pis}" "start" ;; - esac - fi - done - ;; - "stop") - for curr_pis in "${HOME}/${MOZ_USER_DIR}/init.d"/K* "${dist_bin}/init.d"/K* ; do - if [ -x "${curr_pis}" ] ; then - case "${curr_pis}" in - *.sh) . "${curr_pis}" ;; - *) "${curr_pis}" "stop" ;; - esac - fi - done - ;; - *) - echo 1>&2 "$0: Internal error in moz_pis_startstop_scripts." - exit 1 - ;; - esac -} - #uncomment for debugging #set -x @@ -172,9 +132,6 @@ done export MRE_HOME -## Start addon scripts -moz_pis_startstop_scripts "start" - if [ $debugging = 1 ] then echo $dist_bin/run-mozilla.sh $script_args $dist_bin/$MOZILLA_BIN "$@" @@ -182,8 +139,5 @@ fi "$dist_bin/run-mozilla.sh" $script_args "$dist_bin/$MOZILLA_BIN" "$@" exitcode=$? -## Stop addon scripts -moz_pis_startstop_scripts "stop" - exit $exitcode # EOF. diff --git a/mozilla/suite/app/seamonkey.in b/mozilla/suite/app/seamonkey.in index ad7328cc385..f5f044a4509 100755 --- a/mozilla/suite/app/seamonkey.in +++ b/mozilla/suite/app/seamonkey.in @@ -36,7 +36,7 @@ # # ***** END LICENSE BLOCK ***** -## $Id: seamonkey.in,v 1.1 2006-07-29 08:47:11 ajschult%verizon.net Exp $ +## $Id: seamonkey.in,v 1.2 2007-06-23 05:30:29 ajschult%verizon.net Exp $ ## ## Usage: ## @@ -48,46 +48,6 @@ ## the application binary to work. ## -moz_pis_startstop_scripts() -{ - MOZ_USER_DIR="%MOZ_USER_DIR%" - # MOZ_PIS_ is the name space for "Mozilla Plugable Init Scripts" - # These variables and there meaning are specified in - # mozilla/xpfe/bootstrap/init.d/README - MOZ_PIS_API=2 - MOZ_PIS_MOZBINDIR="${dist_bin}" - MOZ_PIS_SESSION_PID="$$" - MOZ_PIS_USER_DIR="${MOZ_USER_DIR}" - export MOZ_PIS_API MOZ_PIS_MOZBINDIR MOZ_PIS_SESSION_PID MOZ_PIS_USER_DIR - - case "${1}" in - "start") - for curr_pis in "${dist_bin}/init.d"/S* "${HOME}/${MOZ_USER_DIR}/init.d"/S* ; do - if [ -x "${curr_pis}" ] ; then - case "${curr_pis}" in - *.sh) . "${curr_pis}" ;; - *) "${curr_pis}" "start" ;; - esac - fi - done - ;; - "stop") - for curr_pis in "${HOME}/${MOZ_USER_DIR}/init.d"/K* "${dist_bin}/init.d"/K* ; do - if [ -x "${curr_pis}" ] ; then - case "${curr_pis}" in - *.sh) . "${curr_pis}" ;; - *) "${curr_pis}" "stop" ;; - esac - fi - done - ;; - *) - echo 1>&2 "$0: Internal error in moz_pis_startstop_scripts." - exit 1 - ;; - esac -} - #uncomment for debugging #set -x @@ -172,9 +132,6 @@ done export MRE_HOME -## Start addon scripts -moz_pis_startstop_scripts "start" - if [ $debugging = 1 ] then echo $dist_bin/run-mozilla.sh $script_args $dist_bin/$MOZILLA_BIN "$@" @@ -182,8 +139,5 @@ fi "$dist_bin/run-mozilla.sh" $script_args "$dist_bin/$MOZILLA_BIN" "$@" exitcode=$? -## Stop addon scripts -moz_pis_startstop_scripts "stop" - exit $exitcode # EOF.