[gentoo-commits] proj/openrc:master commit in: src/rc/

[William Hubbs]

commit:     ad23d5b8dbee70815c02271c78f415bcd7088076
Author:     William Hubbs <w.d.hubbs <AT> gmail <DOT> com>
AuthorDate: Wed May  4 23:17:58 2016 +0000
Commit:     William Hubbs <williamh <AT> gentoo <DOT> org>
CommitDate: Wed May  4 23:17:58 2016 +0000
URL:        https://gitweb.gentoo.org/proj/openrc.git/commit/?id=ad23d5b8

openrc-run: clean up runscript deprecation message

 src/rc/openrc-run.c | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/src/rc/openrc-run.c b/src/rc/openrc-run.c
index 5e3ba67..dfb4c6f 100644
--- a/src/rc/openrc-run.c
+++ b/src/rc/openrc-run.c
@@ -1106,6 +1106,7 @@ service_plugable(void)
 int main(int argc, char **argv)
 {
        bool doneone = false;
+       bool runscript = false;
        int retval, opt, depoptions = RC_DEP_TRACE;
        RC_STRING *svc;
        char path[PATH_MAX], lnk[PATH_MAX];
@@ -1123,7 +1124,7 @@ int main(int argc, char **argv)
 
        applet = basename_c(argv[0]);
        if (strcmp(applet, "runscript") == 0)
-               ewarnv("runscript is deprecated, please use openrc-run 
instead.");
+               runscript = true;
 
        if (stat(argv[1], &stbuf) != 0) {
                fprintf(stderr, "openrc-run `%s': %s\n",
@@ -1172,6 +1173,9 @@ int main(int argc, char **argv)
        if (argc < 3)
                usage(EXIT_FAILURE);
 
+       if (runscript)
+               ewarnv("%s uses runscript, please convert to openrc-run.", 
service);
+
        /* Change dir to / to ensure all init scripts don't use stuff in pwd */
        if (chdir("/") == -1)
                eerror("chdir: %s", strerror(errno));