t push origin masterMerge branch 'fix-package'

vccw-team · Nov 15, 2017 · 2f26ae1 · 2f26ae1
2 parents 26ca8a2 + f59aa49
commit 2f26ae1
Show file tree

Hide file tree

Showing 2 changed files with 1 addition and 2 deletions.
diff --git a/bin/deploy.sh b/bin/deploy.sh
@@ -16,8 +16,6 @@ rm -f Gemfile.lock
 rm -f Movefile
 rm -f Rakefile
 rm -fr vendor
-rm -fr wp-cli
-rm -f wp-cli.yml
 
 cat <<EOF > .gitignore
 .DS_Store

diff --git a/bin/run-docker.sh b/bin/run-docker.sh
@@ -51,3 +51,4 @@ docker exec --user ubuntu --tty ${VCCW_HOSTNAME} \
 env TERM=xterm ansible-playbook ${VM_DIR}/provision/playbook.yml -e "$(ruby $RUBY)"
 
 docker exec --tty ${VCCW_HOSTNAME} env TERM=xterm rm -f ${VM_DIR}/wp-cli.yml
+docker exec --tty ${VCCW_HOSTNAME} env TERM=xterm rm -fr ${VM_DIR}/wp-cli
Original file line number	Diff line number	Diff line change
Expand Up		@@ -51,3 +51,4 @@ docker exec --user ubuntu --tty ${VCCW_HOSTNAME} \
		env TERM=xterm ansible-playbook ${VM_DIR}/provision/playbook.yml -e "$(ruby $RUBY)"

		docker exec --tty ${VCCW_HOSTNAME} env TERM=xterm rm -f ${VM_DIR}/wp-cli.yml
		docker exec --tty ${VCCW_HOSTNAME} env TERM=xterm rm -fr ${VM_DIR}/wp-cli