From 04065e48a6ed21229a943271000d3e496b5a12d1 Mon Sep 17 00:00:00 2001
From: Piotr Maslanka <piotr.maslanka@henrietta.com.pl>
Date: Mon, 27 Mar 2017 11:25:17 +0200
Subject: [PATCH] check
---
nodejs5_jdk_adk25/build_as_vagrant.sh | 5 ++---
wynurz.sh | 4 ++--
2 files changed, 4 insertions(+), 5 deletions(-)
diff --git a/nodejs5_jdk_adk25/build_as_vagrant.sh b/nodejs5_jdk_adk25/build_as_vagrant.sh
index 59ab41f..d27561c 100644
--- a/nodejs5_jdk_adk25/build_as_vagrant.sh
+++ b/nodejs5_jdk_adk25/build_as_vagrant.sh
@@ -10,15 +10,14 @@ export ANDROID_HOME=/home/vagrant
""" >> /home/vagrant/.bashrc
source /home/vagrant/.bashrc
-(wynurz node5 &&
-sudo npm install -g --unsafe-perm bower gulp cordova@6.3.1 karma) &
-
+wynurz node5 && sudo npm install -g --unsafe-perm bower gulp cordova@6.3.1 karma &
wynurz get-adt25 &
wynurz jdk
wait %2
+cd /home/vagrant
echo y | ./tools/bin/sdkmanager "build-tools;25.0.1" "build-tools;24.0.0" "platforms;android-25" "platforms;android-24" "platforms;android-23" "platform-tools" "extras;android;m2repository" "extras;google;m2repository" "extras;google;google_play_services"
wait %1
diff --git a/wynurz.sh b/wynurz.sh
index 3dc3dd1..e8d5c16 100644
--- a/wynurz.sh
+++ b/wynurz.sh
@@ -37,8 +37,8 @@ if [ $1 == "get-adt25" ]; then
else
wget -nv http://dev.dms-serwis.com.pl/misc/tools_r25.2.3-linux.zip
fi;
- unzip tools_r25.2.3-linux.zip
- rm -f tools_r25.2.3-linux.zip
+ unzip tools_r25.2.3-linux.zip
+ rm -f tools_r25.2.3-linux.zip
fi
if [ $1 == "jdk" ]; then
--
GitLab