1
0
mirror of https://gitlab.com/fdroid/fdroidserver.git synced 2024-10-03 17:50:11 +02:00

Fix ndk always being reinstalled

This commit is contained in:
Daniel Martí 2015-11-20 17:24:19 -08:00
parent 73c680dfcf
commit 326e299e15

View File

@ -8,11 +8,8 @@ script "setup-android-ndk" do
user node[:settings][:user]
cwd "/tmp"
code "
mkdir #{ndk_loc}
mkdir -p #{ndk_loc}
"
not_if do
File.exists?("#{ndk_loc}")
end
end
script "setup-android-ndk-r9b" do
@ -30,9 +27,7 @@ script "setup-android-ndk-r9b" do
tar jxvf /vagrant/cache/android-ndk-r9b-linux-x86$SUFFIX-legacy-toolchains.tar.bz2
mv android-ndk-r9b #{ndk_loc}/r9b
"
not_if do
File.exists?("#{ndk_loc}/r9b")
end
not_if "test -d #{ndk_loc}/r9b"
end
script "setup-android-ndk-r10e" do
@ -50,8 +45,6 @@ script "setup-android-ndk-r10e" do
/vagrant/cache/android-ndk-r10e-linux-x86$SUFFIX.bin x
mv android-ndk-r10e #{ndk_loc}/r10e
"
not_if do
File.exists?("#{ndk_loc}/r10e")
end
not_if "test -d #{ndk_loc}/r10e"
end