mirrors/fdroidserver
1
0
Fork 0
mirror of https://github.com/f-droid/fdroidserver.git synced 2025-11-07 07:50:28 +03:00
Code Issues Projects Releases Packages Wiki Activity Actions

Fix ndk always being reinstalled

Browse source
This commit is contained in:
Daniel Martí 2015-11-20 17:24:19 -08:00
parent 73c680dfcf
commit 326e299e15
1 changed files with 3 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

13
buildserver/cookbooks/android-ndk/recipes/default.rb
View file

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