diff options
author | sobomax <sobomax@FreeBSD.org> | 2001-08-02 12:38:29 +0000 |
---|---|---|
committer | sobomax <sobomax@FreeBSD.org> | 2001-08-02 12:38:29 +0000 |
commit | fd136a35b7dd890f7e0311529a85fb68a1a77d13 (patch) | |
tree | e0c4b81d815e2f6178ad7197381d4118747ff56d /usr.sbin/pkg_install/add | |
parent | a9479014c3acf16862bef0f26b143ab5a3e45eeb (diff) | |
download | FreeBSD-src-fd136a35b7dd890f7e0311529a85fb68a1a77d13.zip FreeBSD-src-fd136a35b7dd890f7e0311529a85fb68a1a77d13.tar.gz |
Usability tweak:
Use '' quotes instead of `' to delimit names of files and packages in
warning and error messages, because it is easier to cut-n-paste name in
question that way (single click) without confusing the shell. And yes,
I know that it is less eye-candy...
MFC after: 1 month
Diffstat (limited to 'usr.sbin/pkg_install/add')
-rw-r--r-- | usr.sbin/pkg_install/add/perform.c | 26 |
1 files changed, 13 insertions, 13 deletions
diff --git a/usr.sbin/pkg_install/add/perform.c b/usr.sbin/pkg_install/add/perform.c index 3f981ad..dfa6269 100644 --- a/usr.sbin/pkg_install/add/perform.c +++ b/usr.sbin/pkg_install/add/perform.c @@ -101,7 +101,7 @@ pkg_do(char *pkg) /* Is it an ftp://foo.bar.baz/file.tgz specification? */ if (isURL(pkg)) { if (!(Home = fileGetURL(NULL, pkg))) { - warnx("unable to fetch `%s' by URL", pkg); + warnx("unable to fetch '%s' by URL", pkg); return 1; } where_to = Home; @@ -109,7 +109,7 @@ pkg_do(char *pkg) cfile = fopen(CONTENTS_FNAME, "r"); if (!cfile) { warnx( - "unable to open table of contents file `%s' - not a package?", + "unable to open table of contents file '%s' - not a package?", CONTENTS_FNAME); goto bomb; } @@ -142,14 +142,14 @@ pkg_do(char *pkg) setenv("_TOP", Home, 1); if (unpack(pkg_fullname, extract)) { warnx( - "unable to extract table of contents file from `%s' - not a package?", + "unable to extract table of contents file from '%s' - not a package?", pkg_fullname); goto bomb; } cfile = fopen(CONTENTS_FNAME, "r"); if (!cfile) { warnx( - "unable to open table of contents file `%s' - not a package?", + "unable to open table of contents file '%s' - not a package?", CONTENTS_FNAME); goto bomb; } @@ -167,7 +167,7 @@ pkg_do(char *pkg) printf("Desired prefix of %s does not exist, creating..\n", p->name); vsystem("mkdir -p %s", p->name); if (chdir(p->name) == -1) { - warn("unable to change directory to `%s'", p->name); + warn("unable to change directory to '%s'", p->name); goto bomb; } } @@ -176,7 +176,7 @@ pkg_do(char *pkg) } else { warnx( - "no prefix specified in `%s' - this is a bad package!", + "no prefix specified in '%s' - this is a bad package!", pkg_fullname); goto bomb; } @@ -203,7 +203,7 @@ pkg_do(char *pkg) /* Finally unpack the whole mess */ if (unpack(pkg_fullname, NULL)) { - warnx("unable to extract `%s'!", pkg_fullname); + warnx("unable to extract '%s'!", pkg_fullname); goto bomb; } } @@ -236,7 +236,7 @@ pkg_do(char *pkg) /* See if we're already registered */ sprintf(LogDir, "%s/%s", (tmp = getenv(PKG_DBDIR)) ? tmp : DEF_LOG_DIR, PkgName); if (isdir(LogDir) && !Force) { - warnx("package `%s' already recorded as installed", PkgName); + warnx("package '%s' already recorded as installed", PkgName); code = 1; goto success; /* close enough for government work */ } @@ -246,7 +246,7 @@ pkg_do(char *pkg) if (p->type != PLIST_PKGDEP) continue; if (Verbose) - printf("Package `%s' depends on `%s'.\n", PkgName, p->name); + printf("Package '%s' depends on '%s'.\n", PkgName, p->name); if (vsystem("pkg_info -e %s", p->name)) { char path[FILENAME_MAX], *cp = NULL; @@ -261,7 +261,7 @@ pkg_do(char *pkg) if (Verbose) printf("Loading it from %s.\n", cp); if (vsystem("pkg_add %s'%s'", Verbose ? "-v " : "", cp)) { - warnx("autoload of dependency `%s' failed%s", + warnx("autoload of dependency '%s' failed%s", cp, Force ? " (proceeding anyway)" : "!"); if (!Force) ++code; @@ -284,13 +284,13 @@ pkg_do(char *pkg) ++code; } else if (vsystem("(pwd; cat +CONTENTS) | pkg_add %s-S", Verbose ? "-v " : "")) { - warnx("pkg_add of dependency `%s' failed%s", + warnx("pkg_add of dependency '%s' failed%s", p->name, Force ? " (proceeding anyway)" : "!"); if (!Force) ++code; } else if (Verbose) - printf("\t`%s' loaded successfully.\n", p->name); + printf("\t'%s' loaded successfully.\n", p->name); /* Nuke the temporary playpen */ leave_playpen(); } @@ -439,7 +439,7 @@ pkg_do(char *pkg) if (p->type != PLIST_PKGDEP) continue; if (Verbose) - printf("Attempting to record dependency on package `%s'\n", p->name); + printf("Attempting to record dependency on package '%s'\n", p->name); sprintf(contents, "%s/%s/%s", (tmp = getenv(PKG_DBDIR)) ? tmp : DEF_LOG_DIR, basename_of(p->name), REQUIRED_BY_FNAME); cfile = fopen(contents, "a"); |