Bug 384714: Purge moz_pis_startstop_scripts from the tree, r=bsmedberg
authorajschult@verizon.net
Fri, 22 Jun 2007 22:30:29 -0700
changeset 2704 d701e69fb6e0c433fbc25beb7a6bd1b30307296f
parent 2703 8f438dab57691744b22dfe9a2e7e66357bf5c8e3
child 2705 1f697a0200b6d11fb9c88082c0c9de2d6a9ece5b
push idunknown
push userunknown
push dateunknown
reviewersbsmedberg
bugs384714
milestone1.9a6pre
Bug 384714: Purge moz_pis_startstop_scripts from the tree, r=bsmedberg
browser/app/mozilla.in
--- a/browser/app/mozilla.in
+++ b/browser/app/mozilla.in
@@ -31,69 +31,29 @@
 # use your version of this file under the terms of the MPL, indicate your
 # decision by deleting the provisions above and replace them with the notice
 # and other provisions required by the GPL or the LGPL. If you do not delete
 # the provisions above, a recipient may use your version of this file under
 # the terms of any one of the MPL, the GPL or the LGPL.
 #
 # ***** 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:
 ##
 ## $ mozilla [args]
 ##
 ## This script is meant to run the mozilla-bin binary from either 
 ## mozilla/xpfe/bootstrap or mozilla/dist/bin.
 ##
 ## The script will setup all the environment voodoo needed to make
 ## 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
 
 moz_libdir=%MOZAPPDIR%
 MRE_HOME=%MREDIR%
 
 # Use run-mozilla.sh in the current dir if it exists
 # If not, then start resolving symlinks until we find run-mozilla.sh
@@ -168,23 +128,17 @@ do
       set -- "$@" "$arg"
       pass_arg_count=`expr $pass_arg_count + 1`
       ;;
   esac
 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 "$@"
 fi
 "$dist_bin/run-mozilla.sh" $script_args "$dist_bin/$MOZILLA_BIN" "$@"
 exitcode=$?
 
-## Stop addon scripts
-moz_pis_startstop_scripts "stop"
-
 exit $exitcode
 # EOF.