From 9ed9c1350adfd169b973680479c9462f95d32fef Mon Sep 17 00:00:00 2001 From: NavaL Date: Tue, 9 Feb 2016 15:58:54 +0100 Subject: refactored osx_setup and debian_setup to use install-pixelated.sh like the vagrant setup Issue #593 --- debian_setup.sh | 31 ++++++++++++++----------------- 1 file changed, 14 insertions(+), 17 deletions(-) (limited to 'debian_setup.sh') diff --git a/debian_setup.sh b/debian_setup.sh index 9634a69e..b1f48838 100644 --- a/debian_setup.sh +++ b/debian_setup.sh @@ -1,22 +1,19 @@ #!/bin/bash # -hash vagrant 2>/dev/null || { echo >&2 "Vagrant is not installed. Aborting."; exit 1; } -hash vboxmanage 2>/dev/null || hash virsh 2>/dev/null || { echo >&2 "Please install Virtualbox or Libvirt first and try again."; exit 1;} - -vagrant_ssh (){ - vagrant ssh -c "export LANG=en_US.UTF-8; export LANGUAGE=en_US.UTF-8; export LC_ALL=en_US.UTF-8; source /home/vagrant/user-agent-venv/bin/activate; cd $1; $2" +function clone_repo { + if [ -d ./pixelated-user-agent ] + then + cd pixelated-user-agent + /usr/bin/git pull --rebase + rm -rf web-ui/node_modules + else + /usr/bin/git clone https://github.com/pixelated/pixelated-user-agent.git + cd pixelated-user-agent + fi } -if [ -d ./pixelated-user-agent ] -then - cd pixelated-user-agent - /usr/bin/git pull --rebase -else - /usr/bin/git clone https://github.com/pixelated/pixelated-user-agent.git - cd pixelated-user-agent -fi - -vagrant up -vagrant_ssh '/vagrant/service' './go setup' -vagrant ssh +sudo apt-get install -y puppet git +clone_repo +sudo puppet apply --modulepath='provisioning/modules' provisioning/manifests/debian.pp +./install-pixelated.sh -v ~/.virtualenv/user-agent-venv -- cgit v1.2.3