From cbcedd8ea841d69bf2f743730c0d4d511bbcb58c Mon Sep 17 00:00:00 2001 From: Stefano Zacchiroli Date: Fri, 16 Apr 2004 16:16:01 +0000 Subject: [PATCH] removed tedious "_mowgli" postfix --- .../{etc_default_helm_mowgli => etc_default_helm} | 14 +++++++------- helm/scripts/init.d/{helm_mowgli => helm} | 6 +++--- .../{helm-bootmisc_mowgli.sh => helm-bootmisc.sh} | 7 ++----- .../{helm-draw-graph_mowgli => helm-draw-graph} | 8 ++++---- .../{helm-http-getter_mowgli => helm-http-getter} | 8 ++++---- ...elm-proof-checker_mowgli => helm-proof-checker} | 6 +++--- .../init.d/{helm-rdfly_mowgli => helm-rdfly} | 8 ++++---- ...elm-search-engine_mowgli => helm-search-engine} | 8 ++++---- ...elm-uri-set-queue_mowgli => helm-uri-set-queue} | 8 ++++---- .../init.d/{helm-uwobo_mowgli => helm-uwobo} | 10 +++++----- .../{helm-tomcat_mowgli => helm-uwobo-stylesheets} | 6 +++--- helm/scripts/init.d/uwobo_forever.sh | 4 ++-- 12 files changed, 45 insertions(+), 48 deletions(-) rename helm/scripts/init.d/{etc_default_helm_mowgli => etc_default_helm} (83%) rename helm/scripts/init.d/{helm_mowgli => helm} (82%) rename helm/scripts/init.d/{helm-bootmisc_mowgli.sh => helm-bootmisc.sh} (60%) rename helm/scripts/init.d/{helm-draw-graph_mowgli => helm-draw-graph} (80%) rename helm/scripts/init.d/{helm-http-getter_mowgli => helm-http-getter} (80%) rename helm/scripts/init.d/{helm-proof-checker_mowgli => helm-proof-checker} (88%) rename helm/scripts/init.d/{helm-rdfly_mowgli => helm-rdfly} (80%) rename helm/scripts/init.d/{helm-search-engine_mowgli => helm-search-engine} (81%) rename helm/scripts/init.d/{helm-uri-set-queue_mowgli => helm-uri-set-queue} (80%) rename helm/scripts/init.d/{helm-uwobo_mowgli => helm-uwobo} (84%) rename helm/scripts/init.d/{helm-tomcat_mowgli => helm-uwobo-stylesheets} (87%) diff --git a/helm/scripts/init.d/etc_default_helm_mowgli b/helm/scripts/init.d/etc_default_helm similarity index 83% rename from helm/scripts/init.d/etc_default_helm_mowgli rename to helm/scripts/init.d/etc_default_helm index 64ced1a28..b284b5dd3 100644 --- a/helm/scripts/init.d/etc_default_helm_mowgli +++ b/helm/scripts/init.d/etc_default_helm @@ -3,13 +3,13 @@ # DAEMONS started/stopped/ecc. by /etc/init.d/helm, name listed here # must correspond to scripts located in /etc/init.d DAEMONS=" - helm-http-getter_mowgli - helm-proof-checker_mowgli - helm-uri-set-queue_mowgli - helm-draw-graph_mowgli - helm-search-engine_mowgli - helm-uwobo_mowgli - helm-rdfly_mowgli + helm-http-getter + helm-proof-checker + helm-uri-set-queue + helm-draw-graph + helm-search-engine + helm-uwobo + helm-rdfly " # script used to load/unload uwobo predefined scripts diff --git a/helm/scripts/init.d/helm_mowgli b/helm/scripts/init.d/helm similarity index 82% rename from helm/scripts/init.d/helm_mowgli rename to helm/scripts/init.d/helm index 710859892..c58a15d50 100755 --- a/helm/scripts/init.d/helm_mowgli +++ b/helm/scripts/init.d/helm @@ -7,8 +7,8 @@ # Last-Modified: Tue, 8 Oct 2002 17:18:17 +0200 DAEMONS="" -if [ -f /etc/default/helm_mowgli ]; then - . /etc/default/helm_mowgli +if [ -f /etc/default/helm ]; then + . /etc/default/helm fi case "$1" in @@ -28,7 +28,7 @@ case "$1" in else echo "Actually, considered daemons are: $DAEMONS" fi - echo "to change this setting see /etc/default/helm_mowgli" + echo "to change this setting see /etc/default/helm" echo exit 1 ;; diff --git a/helm/scripts/init.d/helm-bootmisc_mowgli.sh b/helm/scripts/init.d/helm-bootmisc.sh similarity index 60% rename from helm/scripts/init.d/helm-bootmisc_mowgli.sh rename to helm/scripts/init.d/helm-bootmisc.sh index fc24432d2..37decf723 100755 --- a/helm/scripts/init.d/helm-bootmisc_mowgli.sh +++ b/helm/scripts/init.d/helm-bootmisc.sh @@ -1,13 +1,10 @@ #!/bin/sh HTTP_GETTER_CACHE_DIRS="" -if [ -f /etc/default/helm_mowgli ]; then - . /etc/default/helm_mowgli +if [ -f /etc/default/helm ]; then + . /etc/default/helm fi -# clean pid file for helm related daemons -( cd /var/run/ && rm -f *_mowgli.pid ) - # create http_getter cache dirs for d in $HTTP_GETTER_CACHE_DIRS; do if ! [ -d $d ]; then diff --git a/helm/scripts/init.d/helm-draw-graph_mowgli b/helm/scripts/init.d/helm-draw-graph similarity index 80% rename from helm/scripts/init.d/helm-draw-graph_mowgli rename to helm/scripts/init.d/helm-draw-graph index a8553fb10..70859c08d 100755 --- a/helm/scripts/init.d/helm-draw-graph_mowgli +++ b/helm/scripts/init.d/helm-draw-graph @@ -7,14 +7,14 @@ # Last-Modified: Wed, 9 Oct 2002 11:12:01 +0200 DAEMON=/projects/helm/daemons/graphs/tools/drawGraph.opt -USAGE="Usage: /etc/init.d/helm-draw-graph_mowgli { start | stop | restart }" +USAGE="Usage: /etc/init.d/helm-draw-graph { start | stop | restart }" -if [ -f /etc/default/helm_mowgli ]; then - . /etc/default/helm_mowgli +if [ -f /etc/default/helm ]; then + . /etc/default/helm fi NAME=`basename $DAEMON` -PIDFILE=/var/run/"$NAME"_mowgli.pid +PIDFILE=/var/run/"$NAME".pid do_start () { echo "Starting $DAEMON ..." diff --git a/helm/scripts/init.d/helm-http-getter_mowgli b/helm/scripts/init.d/helm-http-getter similarity index 80% rename from helm/scripts/init.d/helm-http-getter_mowgli rename to helm/scripts/init.d/helm-http-getter index 3ac21e0fa..e1a7061d8 100755 --- a/helm/scripts/init.d/helm-http-getter_mowgli +++ b/helm/scripts/init.d/helm-http-getter @@ -7,14 +7,14 @@ # Last-Modified: Wed, 8 Jan 2003 12:09:41 +0100 DAEMON="/projects/helm/daemons/http_getter/http_getter.opt" -USAGE="Usage: /etc/init.d/helm-http-getter_mowgli { start | stop | restart }" +USAGE="Usage: /etc/init.d/helm-http-getter { start | stop | restart }" -if [ -f /etc/default/helm_mowgli ]; then - . /etc/default/helm_mowgli +if [ -f /etc/default/helm ]; then + . /etc/default/helm fi NAME=`basename $DAEMON` -PIDFILE=/var/run/"$NAME"_mowgli.pid +PIDFILE=/var/run/$NAME.pid do_start () { echo "Starting $DAEMON ..." diff --git a/helm/scripts/init.d/helm-proof-checker_mowgli b/helm/scripts/init.d/helm-proof-checker similarity index 88% rename from helm/scripts/init.d/helm-proof-checker_mowgli rename to helm/scripts/init.d/helm-proof-checker index 8d28c9bf5..9ea0eaffc 100755 --- a/helm/scripts/init.d/helm-proof-checker_mowgli +++ b/helm/scripts/init.d/helm-proof-checker @@ -9,12 +9,12 @@ DAEMON=/projects/helm/daemons/proofChecker/proofChecker.opt USAGE="Usage: /etc/init.d/helm-proof-checker { start | stop | restart }" -if [ -f /etc/default/helm_mowgli ]; then - . /etc/default/helm_mowgli +if [ -f /etc/default/helm ]; then + . /etc/default/helm fi NAME=`basename $DAEMON` -PIDFILE=/var/run/"$NAME"_mowgli.pid +PIDFILE=/var/run/$NAME.pid do_start () { echo "Starting $DAEMON ..." diff --git a/helm/scripts/init.d/helm-rdfly_mowgli b/helm/scripts/init.d/helm-rdfly similarity index 80% rename from helm/scripts/init.d/helm-rdfly_mowgli rename to helm/scripts/init.d/helm-rdfly index 5ff1e67ec..ef17cd239 100755 --- a/helm/scripts/init.d/helm-rdfly_mowgli +++ b/helm/scripts/init.d/helm-rdfly @@ -7,14 +7,14 @@ # Last-Modified: Wed, 8 Jan 2003 12:09:41 +0100 DAEMON="/projects/helm/daemons/rdfly/rdfly.opt" -USAGE="Usage: /etc/init.d/helm-rdfly_mowgli { start | stop | restart }" +USAGE="Usage: /etc/init.d/helm-rdfly { start | stop | restart }" -if [ -f /etc/default/helm_mowgli ]; then - . /etc/default/helm_mowgli +if [ -f /etc/default/helm ]; then + . /etc/default/helm fi NAME=`basename $DAEMON` -PIDFILE=/var/run/"$NAME"_mowgli.pid +PIDFILE=/var/run/$NAME.pid do_start () { echo "Starting $DAEMON ..." diff --git a/helm/scripts/init.d/helm-search-engine_mowgli b/helm/scripts/init.d/helm-search-engine similarity index 81% rename from helm/scripts/init.d/helm-search-engine_mowgli rename to helm/scripts/init.d/helm-search-engine index 45ea7f885..6b9582cb2 100755 --- a/helm/scripts/init.d/helm-search-engine_mowgli +++ b/helm/scripts/init.d/helm-search-engine @@ -7,14 +7,14 @@ # Last-Modified: Thu, 6 Mar 2003 17:40:16 +0100 DAEMON="/projects/helm/daemons/searchEngine/searchEngine.opt" -USAGE="Usage: /etc/init.d/helm-search-engine_mowgli { start | stop | restart }" +USAGE="Usage: /etc/init.d/helm-search-engine { start | stop | restart }" -if [ -f /etc/default/helm_mowgli ]; then - . /etc/default/helm_mowgli +if [ -f /etc/default/helm ]; then + . /etc/default/helm fi NAME=`basename $DAEMON` -PIDFILE=/var/run/"$NAME"_mowgli.pid +PIDFILE=/var/run/$NAME.pid do_start () { echo -n "Starting $DAEMON ... " diff --git a/helm/scripts/init.d/helm-uri-set-queue_mowgli b/helm/scripts/init.d/helm-uri-set-queue similarity index 80% rename from helm/scripts/init.d/helm-uri-set-queue_mowgli rename to helm/scripts/init.d/helm-uri-set-queue index a1a069fcc..415abdee6 100755 --- a/helm/scripts/init.d/helm-uri-set-queue_mowgli +++ b/helm/scripts/init.d/helm-uri-set-queue @@ -7,14 +7,14 @@ # Last-Modified: Wed, 20 Nov 2002 10:50:25 +0100 DAEMON=/projects/helm/daemons/graphs/tools/uriSetQueue.opt -USAGE="Usage: /etc/init.d/helm-uri-set-queue_mowgli { start | stop | restart }" +USAGE="Usage: /etc/init.d/helm-uri-set-queue { start | stop | restart }" -if [ -f /etc/default/helm_mowgli ]; then - . /etc/default/helm_mowgli +if [ -f /etc/default/helm ]; then + . /etc/default/helm fi NAME=`basename $DAEMON` -PIDFILE=/var/run/"$NAME"_mowgli.pid +PIDFILE=/var/run/$NAME.pid do_start () { echo "Starting $DAEMON ..." diff --git a/helm/scripts/init.d/helm-uwobo_mowgli b/helm/scripts/init.d/helm-uwobo similarity index 84% rename from helm/scripts/init.d/helm-uwobo_mowgli rename to helm/scripts/init.d/helm-uwobo index bcdb46983..94dfbe6e1 100755 --- a/helm/scripts/init.d/helm-uwobo_mowgli +++ b/helm/scripts/init.d/helm-uwobo @@ -7,15 +7,15 @@ # Last-Modified: Fri, 16 Apr 2004 17:54:54 +0200 DAEMON="/projects/helm/daemons/uwobo/uwobo.opt" -USAGE="Usage: /etc/init.d/helm-uwobo_mowgli { start | stop | restart }" +USAGE="Usage: /etc/init.d/helm-uwobo { start | stop | restart }" -if [ -f /etc/default/helm_mowgli ]; then - . /etc/default/helm_mowgli +if [ -f /etc/default/helm ]; then + . /etc/default/helm fi NAME=`basename $DAEMON` # Warning: $PIDFILE value is shared by UWOBO respawner, change at your own risk -PIDFILE=/var/run/"$NAME"_mowgli.pid +PIDFILE=/var/run/$NAME.pid do_start () { echo -n "Starting $DAEMON ... " @@ -26,7 +26,7 @@ do_start () { echo -n "Waiting for UWOBO to startup (2 seconds) ... " sleep 2 echo "done!" - /etc/init.d/helm-tomcat_mowgli start + /etc/init.d/helm-uwobo-stylesheets start echo -n "Starting $DAEMON respawner" /etc/init.d/daemon_respawner.sh -p $PIDFILE \ -m root@localhost \ -r http://localhost:58080/help -d `basename $0` & diff --git a/helm/scripts/init.d/helm-tomcat_mowgli b/helm/scripts/init.d/helm-uwobo-stylesheets similarity index 87% rename from helm/scripts/init.d/helm-tomcat_mowgli rename to helm/scripts/init.d/helm-uwobo-stylesheets index 73cf5211c..9c0201446 100755 --- a/helm/scripts/init.d/helm-tomcat_mowgli +++ b/helm/scripts/init.d/helm-uwobo-stylesheets @@ -7,8 +7,8 @@ # Last-Modified: Wed, 9 Oct 2002 14:26:27 +0200 UWOBO_INIT_SCRIPT="" -if [ -f /etc/default/helm_mowgli ]; then - . /etc/default/helm_mowgli +if [ -f /etc/default/helm ]; then + . /etc/default/helm fi test -x "$UWOBO_INIT_SCRIPT" || exit 0 @@ -42,7 +42,7 @@ case "$1" in *) echo - echo "Usage: /etc/init.d/helm-tomcat_mowgli { start | stop | restart | reload }" >&2 + echo "Usage: /etc/init.d/helm-uwobo-stylesheets { start | stop | restart | reload }" >&2 echo exit 1 ;; diff --git a/helm/scripts/init.d/uwobo_forever.sh b/helm/scripts/init.d/uwobo_forever.sh index a7985c464..3b8e5d2e8 100755 --- a/helm/scripts/init.d/uwobo_forever.sh +++ b/helm/scripts/init.d/uwobo_forever.sh @@ -14,7 +14,7 @@ exit 0 # Warning: $PIDFILE value is shared by UWOBO /etc/init.d script, change at your # own risk -PIDFILE="/var/run/uwobo.opt_mowgli.pid" +PIDFILE="/var/run/uwobo.opt.pid" MAILTO="root@mowgli.cs.unibo.it" INTERVAL="60" @@ -38,7 +38,7 @@ uwobo_is_alive () # start uwobo start_uwobo () { - /etc/init.d/helm-uwobo_mowgli start & + /etc/init.d/helm-uwobo start & } # first check -- 2.39.2