From 68a7715820988a5a3f424c64e39893235f95f4b8 Mon Sep 17 00:00:00 2001 From: Igor Yozhikov Date: Fri, 24 May 2013 15:51:35 +0400 Subject: [PATCH] Changed output messages Change-Id: I669415a58c276f1b064d0aca07fd5d32cb9b60f2 --- setup-centos.sh | 4 ++-- setup.sh | 5 ++--- 2 files changed, 4 insertions(+), 5 deletions(-) diff --git a/setup-centos.sh b/setup-centos.sh index 49385f553..ff93eeb77 100644 --- a/setup-centos.sh +++ b/setup-centos.sh @@ -127,7 +127,7 @@ CLONE_FROM_GIT=$1 # inject init injectinit() { -echo "description \"Murano Conductor service\" +echo "description \"$SERVICE_SRV_NAME service\" author \"Igor Yozhikov \" start on runlevel [2345] stop on runlevel [!2345] @@ -166,7 +166,7 @@ case $COMMAND in inject-init ) # searching for daemon PATH if [ ! -x $SERVICE_EXEC_PATH ]; then - log "Can't find \"conductor\" in at \"$SERVICE_EXEC_PATH\", please install the \"$SERVICE_SRV_NAME\" or set variable SERVICE_EXEC_PATH=/path/to/daemon before running setup script, exiting!!!" + log "Can't find \"$SERVICE_SRV_NAME\" in at \"$SERVICE_EXEC_PATH\", please install the \"$SERVICE_SRV_NAME\" or set variable SERVICE_EXEC_PATH=/path/to/daemon before running setup script, exiting!!!" exit fi ln -s /lib/init/upstart-job /etc/init.d/$SERVICE_SRV_NAME diff --git a/setup.sh b/setup.sh index fed246bc1..234ad54bb 100644 --- a/setup.sh +++ b/setup.sh @@ -131,7 +131,7 @@ CLONE_FROM_GIT=$1 injectinit() { ln -s /lib/init/upstart-job /etc/init.d/$SERVICE_SRV_NAME -echo "description \"Murano Conductor service\" +echo "description \"$SERVICE_SRV_NAME service\" author \"Igor Yozhikov \" start on runlevel [2345] stop on runlevel [!2345] @@ -142,7 +142,6 @@ exec start-stop-daemon --start --chuid root --user root --name $SERVICE_SRV_NAME log "Reloading initctl" initctl reload-configuration update-rc.d $SERVICE_SRV_NAME defaults - } # purge init @@ -173,7 +172,7 @@ case $COMMAND in inject-init ) # searching for daemon PATH if [ ! -x $SERVICE_EXEC_PATH ]; then - log "Can't find \"conductor\" in at \"$SERVICE_EXEC_PATH\", please install the \"$SERVICE_SRV_NAME\" or set variable SERVICE_EXEC_PATH=/path/to/daemon before running setup script, exiting!!!" + log "Can't find \"$SERVICE_SRV_NAME\" in at \"$SERVICE_EXEC_PATH\", please install the \"$SERVICE_SRV_NAME\" or set variable SERVICE_EXEC_PATH=/path/to/daemon before running setup script, exiting!!!" exit fi log "Injecting \"$SERVICE_SRV_NAME\" to init..."