From: Hans-Christoph Steiner Date: Tue, 14 Jun 2016 21:21:39 +0000 (+0200) Subject: REBASE buildserver: handle loops in bash, not ruby, to save memory X-Git-Tag: 0.7.0~51^2 X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=commitdiff_plain;h=51e8776a883cf81e30b96bf13b615da874b5d019;p=fdroidserver.git REBASE buildserver: handle loops in bash, not ruby, to save memory --- diff --git a/buildserver/cookbooks/android-sdk/recipes/default.rb b/buildserver/cookbooks/android-sdk/recipes/default.rb index 3be497f1..d5a87170 100644 --- a/buildserver/cookbooks/android-sdk/recipes/default.rb +++ b/buildserver/cookbooks/android-sdk/recipes/default.rb @@ -18,14 +18,6 @@ script "setup-android-sdk" do not_if "test -d #{sdk_loc}" end -script "setup-sdk-dirs" do - interpreter "bash" - user user - code " - mkdir -p #{sdk_loc}/build-tools - " -end - execute "add-android-sdk-path" do user user path = "#{sdk_loc}/tools:#{sdk_loc}/platform-tools" @@ -33,7 +25,6 @@ execute "add-android-sdk-path" do not_if "grep PATH-SDK /home/#{user}/.bsenv" end - script "add_android_packages" do interpreter "bash" user user @@ -48,7 +39,6 @@ end script "add-platforms" do interpreter "bash" user user - cwd "/tmp" code " rm -rf current-platform mkdir current-platform @@ -65,7 +55,6 @@ end script "add_build_tools" do interpreter "bash" user user - cwd "/tmp" code " rm -rf current-build-tools mkdir current-build-tools