Skip to content

Commit

Permalink
Merge commit '55017dbb330009204858d6608bf124bdaa13294d' into theand1404
Browse files Browse the repository at this point in the history
* commit '55017dbb330009204858d6608bf124bdaa13294d':
  The slug for Ubuntu of the digital ocean provider has a typo
  Fix $PATH for android-sdk
  • Loading branch information
theand committed Mar 9, 2015
2 parents 97cf07c + 55017db commit 6baf6e3
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 3 deletions.
2 changes: 1 addition & 1 deletion Vagrantfile
Original file line number Diff line number Diff line change
Expand Up @@ -180,7 +180,7 @@ Vagrant.configure("2") do |config|
override.vm.box_url = "https://github.com/smdahlen/vagrant-digitalocean/raw/master/box/digital_ocean.box"

provider.token = 'YOUR TOKEN'
provider.image = 'Ubuntu 14.04 x64'
provider.image = 'ubuntu-14-04-x64'
provider.region = 'nyc2'
provider.size = '512mb'
end
Expand Down
4 changes: 2 additions & 2 deletions scripts/android.sh
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ sudo rm -rf $ANDROID_SDK_FILENAME
echo "" >> /home/vagrant/.bashrc
echo "JAVA_HOME=/usr/lib/jvm/java-7-openjdk-i386/jre/bin/java" >> /home/vagrant/.bashrc
echo "ANDROID_HOME=~/android-sdk-linux" >> /home/vagrant/.bashrc
echo "PATH=\$PATH:~/android-sdk-linux/tools:~/android-sdk-linux/platform-tools" >> /home/vagrant/.bashrc
echo "export PATH=\$PATH:~/android-sdk-linux/tools:~/android-sdk-linux/platform-tools" >> /home/vagrant/.bashrc

expect -c '
set timeout -1 ;
Expand All @@ -33,4 +33,4 @@ expect {

sudo /home/vagrant/android-sdk-linux/platform-tools/adb kill-server
sudo /home/vagrant/android-sdk-linux/platform-tools/adb start-server
sudo /home/vagrant/android-sdk-linux/platform-tools/adb devices
sudo /home/vagrant/android-sdk-linux/platform-tools/adb devices

0 comments on commit 6baf6e3

Please sign in to comment.