diff options
author | Tor Egge <Tor.Egge@yahoo-inc.com> | 2017-06-09 10:09:50 +0000 |
---|---|---|
committer | Tor Egge <Tor.Egge@yahoo-inc.com> | 2017-06-09 10:09:50 +0000 |
commit | c0f13c0aca208670849148fbb9fb3770cdcafa99 (patch) | |
tree | 15f023765721667e789a4d7328fca00cfc2c989b | |
parent | 89b7b95346eacff1dfedf03828de888043dfd940 (diff) |
Rename config-model programs to have vespa- prefix.
Temporarily add symlinks from old name to new name.
-rwxr-xr-x | config-model/src/main/perl/vespa-deploy (renamed from config-model/src/main/perl/deploy) | 12 | ||||
-rwxr-xr-x | config-model/src/main/perl/vespa-deploy-application (renamed from config-model/src/main/perl/deploy-application) | 8 | ||||
-rwxr-xr-x | config-model/src/main/perl/vespa-expand-config.pl (renamed from config-model/src/main/perl/expand-config.pl) | 0 | ||||
-rwxr-xr-x | config-model/src/main/sh/vespa-validate-application (renamed from config-model/src/main/sh/validate-application) | 0 | ||||
-rwxr-xr-x | dist/post_install.sh | 6 | ||||
-rw-r--r-- | install_java.cmake | 8 |
6 files changed, 20 insertions, 14 deletions
diff --git a/config-model/src/main/perl/deploy b/config-model/src/main/perl/vespa-deploy index dc7b2132792..6db4aff672a 100755 --- a/config-model/src/main/perl/deploy +++ b/config-model/src/main/perl/vespa-deploy @@ -220,28 +220,28 @@ sub usage { when ("activate") { usage_activate(); } when ("fetch") { usage_fetch(); } default { - print "Usage: deploy [-h] [-v] [-f] [-t] [-p] [<command>] [args]\n"; + print "Usage: vespa-deploy [-h] [-v] [-f] [-t] [-p] [<command>] [args]\n"; print "Supported commands: 'upload', 'prepare', 'activate', 'fetch' and 'help'\n"; print "Supported options: '-h' (help), '-v' (verbose), '-f' (force/ignore validation errors), '-t' (timeout in seconds), '-p' (config server http port)\n"; - print "Try 'deploy help <command>' to get more help\n"; + print "Try 'vespa-deploy help <command>' to get more help\n"; } } } sub usage_upload { - print "Usage: deploy upload <application package>\n"; + print "Usage: vespa-deploy upload <application package>\n"; } sub usage_prepare { - print "Usage: deploy prepare [<session_id> | <application package>]\n"; + print "Usage: vespa-deploy prepare [<session_id> | <application package>]\n"; } sub usage_activate { - print "Usage: deploy activate [<session_id>]\n"; + print "Usage: vespa-deploy activate [<session_id>]\n"; } sub usage_fetch { - print "Usage: deploy fetch <output directory>\n"; + print "Usage: vespa-deploy fetch <output directory>\n"; } sub fetch_active_application { diff --git a/config-model/src/main/perl/deploy-application b/config-model/src/main/perl/vespa-deploy-application index 2fe5675329c..736211aa138 100755 --- a/config-model/src/main/perl/deploy-application +++ b/config-model/src/main/perl/vespa-deploy-application @@ -1,6 +1,6 @@ #!/usr/bin/env perl # Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. -# This script is a wrapper exposing the legacy deploy-application script +# This script is a wrapper exposing the legacy vespa-deploy-application script use strict; use warnings; @@ -50,16 +50,16 @@ if ($dryrun) { $flags .= "-n "; } -print "WARNING: deploy-application is deprecated, use 'deploy prepare' instead\n\n"; +print "WARNING: vespa-deploy-application is deprecated, use 'vespa-deploy prepare' instead\n\n"; -my $DEPLOY="deploy $flags prepare $app"; +my $DEPLOY="vespa-deploy $flags prepare $app"; system($DEPLOY); if ($? == 0) { print "Activate the application by running 'activate-application'\n"; } sub print_usage { print "\n"; - print "usage: deploy-application <application-directory>\n"; + print "usage: vespa-deploy-application <application-directory>\n"; print "Switches:\n"; print "-h This help text\n"; print "-d Debug (stack trace on exceptions)\n"; diff --git a/config-model/src/main/perl/expand-config.pl b/config-model/src/main/perl/vespa-expand-config.pl index 198dc9f3447..198dc9f3447 100755 --- a/config-model/src/main/perl/expand-config.pl +++ b/config-model/src/main/perl/vespa-expand-config.pl diff --git a/config-model/src/main/sh/validate-application b/config-model/src/main/sh/vespa-validate-application index 8fbcb98ea92..8fbcb98ea92 100755 --- a/config-model/src/main/sh/validate-application +++ b/config-model/src/main/sh/vespa-validate-application diff --git a/dist/post_install.sh b/dist/post_install.sh index a5cb48c2d9e..ac260903ec0 100755 --- a/dist/post_install.sh +++ b/dist/post_install.sh @@ -103,3 +103,9 @@ ln -s vespa-log-replay $INSTALLPATH/bin/vlogreplay ln -s vespa-dump-slotfile $INSTALLPATH/bin/dumpslotfile ln -s vespa-vds-disktool-bin $INSTALLPATH/bin/vdsdisktool-bin ln -s vespa-vds-disktool $INSTALLPATH/bin/vdsdisktool + +# Temporary when renaming programs in config-model +ln -s vespa-deploy $INSTALLPATH/bin/deploy +ln -s vespa-deploy-application $INSTALLPATH/bin/deploy-application +ln -s vespa-expand-config.pl $INSTALLPATH/bin/expand-config.pl +ln -s vespa-validate-application $INSTALLPATH/bin/validate-application diff --git a/install_java.cmake b/install_java.cmake index 408582b387e..450bbdd9b5e 100644 --- a/install_java.cmake +++ b/install_java.cmake @@ -52,11 +52,11 @@ install_fat_java_artifact(zkfacade) vespa_install_script(application-preprocessor/src/main/sh/vespa-preprocess-application bin) vespa_install_script(jdisc_core/src/main/perl/jdisc_logfmt bin) vespa_install_script(config-proxy/src/main/sh/config-ctl bin) -vespa_install_script(config-model/src/main/perl/deploy bin) -vespa_install_script(config-model/src/main/perl/deploy-application bin) -vespa_install_script(config-model/src/main/perl/expand-config.pl bin) +vespa_install_script(config-model/src/main/perl/vespa-deploy bin) +vespa_install_script(config-model/src/main/perl/vespa-deploy-application bin) +vespa_install_script(config-model/src/main/perl/vespa-expand-config.pl bin) vespa_install_script(config-model/src/main/perl/vespa-replicate-log-stream bin) -vespa_install_script(config-model/src/main/sh/validate-application bin) +vespa_install_script(config-model/src/main/sh/vespa-validate-application bin) vespa_install_script(container-disc/src/main/sh/vespa-start-container-daemon.sh vespa-start-container-daemon bin) vespa_install_script(vespaclient-java/src/main/sh/vds-document-statistics.sh vds-document-statistics bin) vespa_install_script(vespaclient-java/src/main/sh/vdsstat.sh vdsstat bin) |