You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@trafficcontrol.apache.org by mi...@apache.org on 2017/04/13 03:32:37 UTC
[2/4] incubator-trafficcontrol git commit: chdir immediately before
download_web_deps
chdir immediately before download_web_deps
Project: http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/commit/65d1de01
Tree: http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/tree/65d1de01
Diff: http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/diff/65d1de01
Branch: refs/heads/master
Commit: 65d1de01c6a9a25146e88540c7bb49ffc2d2ab5b
Parents: 670bb30
Author: Dan Kirkwood <da...@gmail.com>
Authored: Wed Apr 12 17:51:55 2017 -0600
Committer: Jeremy Mitchell <mi...@gmail.com>
Committed: Wed Apr 12 21:31:58 2017 -0600
----------------------------------------------------------------------
traffic_ops/install/bin/postinstall | 6 ++++--
1 file changed, 4 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/65d1de01/traffic_ops/install/bin/postinstall
----------------------------------------------------------------------
diff --git a/traffic_ops/install/bin/postinstall b/traffic_ops/install/bin/postinstall
index 475bb02..bb09faa 100755
--- a/traffic_ops/install/bin/postinstall
+++ b/traffic_ops/install/bin/postinstall
@@ -737,14 +737,14 @@ sub main {
# check the input config file against the defaults to check for missing questions
sanityCheckConfig($userInput) if ( $inputFile ne "" );
- chdir("/opt/traffic_ops/install/bin");
-
# if reconfigure is set then rebuild the perl deps
if ($reconfigure) {
my $rc = BuildPerlDeps::build( 1, $cpanLogFile );
if ( $rc != 0 ) {
errorOut("Failed to install perl dependencies, check the console output and rerun postinstall once you've resolved the error");
}
+
+ chdir("/opt/traffic_ops/install/bin");
$rc = InstallUtils::execCommand( "./download_web_deps", "-i" );
if ( $rc != 0 ) {
errorOut("Failed to install Traffic Ops Web dependencies, check the console output and rerun postinstall once you've resolved the error");
@@ -755,6 +755,8 @@ sub main {
if ( $rc != 0 ) {
errorOut("Failed to install perl dependencies, check the console output and rerun postinstall once you've resolved the error");
}
+
+ chdir("/opt/traffic_ops/install/bin");
$rc = InstallUtils::execCommand( "./download_web_deps", "-i" );
if ( $rc != 0 ) {
errorOut("Failed to install Traffic Ops Web dependencies, check the console output and rerun postinstall once you've resolved the error");