From 7cb88d92e00b985ace8adf88ffadf99c00aff67f Mon Sep 17 00:00:00 2001
From: Marcus Furlong <furlongm@gmail.com>
Date: Fri, 12 Jul 2019 11:04:24 -0400
Subject: [PATCH] Use correct shipyard directories

Change-Id: I54057dde3d6ddf31026afa53b1a52420f67b9f09
---
 manifests/common/deploy-airship.sh | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/manifests/common/deploy-airship.sh b/manifests/common/deploy-airship.sh
index 3f931257..95a1ddf3 100755
--- a/manifests/common/deploy-airship.sh
+++ b/manifests/common/deploy-airship.sh
@@ -164,11 +164,11 @@ function get_repo() {
   # $3 = refspec of repo pull
   cd ${WORKSPACE}
   if [ ! -d "$1" ] ; then
-    git clone $2
+    git clone $2 $1
     if [ -n "$3" ] ; then
-      cd $1
+      pushd $1
       git pull $2 $3
-      cd ..
+      popd
     fi
   fi
 }
@@ -176,11 +176,11 @@ function get_repo() {
 function setup_repos() {
   # Clone and pull the various git repos
   # Get pegleg for the script only. Image is separately referenced.
-  get_repo airship-pegleg ${PEGLEG_REPO} ${PEGLEG_REFSPEC}
+  get_repo pegleg ${PEGLEG_REPO} ${PEGLEG_REFSPEC}
   # Get airship-in-a-bottle for the design
   get_repo airship-in-a-bottle ${AIRSHIP_IN_A_BOTTLE_REPO} ${AIRSHIP_IN_A_BOTTLE_REFSPEC}
   # Get Shipyard for use after genesis
-  get_repo airship-shipyard ${SHIPYARD_REPO} ${SHIPYARD_REFSPEC}
+  get_repo shipyard ${SHIPYARD_REPO} ${SHIPYARD_REFSPEC}
 }
 
 function configure_dev_configurables() {
@@ -302,9 +302,9 @@ function setup_deploy_site() {
   mkdir -p ${WORKSPACE}/site
   cp ${WORKSPACE}/airship-in-a-bottle/manifests/common/creds.sh ${WORKSPACE}/site
   cp ${WORKSPACE}/genesis/*.yaml ${WORKSPACE}/site
-  cp ${WORKSPACE}/airship-shipyard/tools/run_shipyard.sh ${WORKSPACE}/site
-  cp ${WORKSPACE}/airship-shipyard/tools/shipyard_docker_base_command.sh ${WORKSPACE}/site
-  cp ${WORKSPACE}/airship-shipyard/tools/execute_shipyard_action.sh ${WORKSPACE}/site
+  cp ${WORKSPACE}/shipyard/tools/run_shipyard.sh ${WORKSPACE}/site
+  cp ${WORKSPACE}/shipyard/tools/shipyard_docker_base_command.sh ${WORKSPACE}/site
+  cp ${WORKSPACE}/shipyard/tools/execute_shipyard_action.sh ${WORKSPACE}/site
   print_shipyard_info2
 }
 function print_shipyard_info2() {