kamp/fdroidserver
1
0
Fork 0
mirror of https://gitlab.com/fdroid/fdroidserver.git synced 2024-07-07 09:50:07 +02:00
Code Activity

Get non-interactive bash env right

Browse Source
This commit is contained in:
Ciaran Gultnieks 2013-08-29 21:05:25 +01:00
parent d5df260c88
commit 0658a9b8ac
3 changed files with 14 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
buildserver/cookbooks/android-sdk/recipes/default.rb
View File

@ -19,14 +19,14 @@ end
execute "add-android-sdk-path" do
user user
path = "#{sdk_loc}/tools:#{sdk_loc}/platform-tools"
command "echo \"export PATH=\\$PATH:#{path} #PATH-SDK\" >> /home/#{user}/.bashrc"
not_if "grep PATH-SDK /home/#{user}/.bashrc"
command "echo \"export PATH=\\$PATH:#{path} #PATH-SDK\" >> /home/#{user}/.bsenv"
not_if "grep PATH-SDK /home/#{user}/.bsenv"
end
execute "add-android-home" do
user user
command "echo \"export ANDROID_HOME=#{sdk_loc}\" >> /home/#{user}/.bashrc"
not_if "grep ANDROID_HOME /home/#{user}/.bashrc"
command "echo \"export ANDROID_HOME=#{sdk_loc}\" >> /home/#{user}/.bsenv"
not_if "grep ANDROID_HOME /home/#{user}/.bsenv"
end
%w{17.0.0 18.0.1}.each do |ver|

13
buildserver/cookbooks/fdroidbuild-general/recipes/default.rb
View File

@ -27,13 +27,18 @@ end
execute "add-gradle-home" do
user user
command "echo \"export GRADLE_HOME=/opt/gradle\" >> /home/#{user}/.bashrc"
not_if "grep GRADLE_HOME /home/#{user}/.bashrc"
command "echo \"export GRADLE_HOME=/opt/gradle\" >> /home/#{user}/.bsenv"
not_if "grep GRADLE_HOME /home/#{user}/.bsenv"
end
execute "add-gradle-bin" do
user user
command "echo \"export PATH=\\$PATH:/opt/gradle/bin\" >> /home/#{user}/.bashrc"
not_if "grep gradle/bin /home/#{user}/.bashrc"
command "echo \"export PATH=\\$PATH:/opt/gradle/bin\" >> /home/#{user}/.bsenv"
not_if "grep gradle/bin /home/#{user}/.bsenv"
end
execute "add-bsenv" do
user user
command "echo \". ./bsenv \" >> /home/#{user}/.bashrc"
not_if "grep bsenv /home/#{user}/.bashrc"
end

2
fdroidserver/build.py
View File

@ -287,7 +287,7 @@ def build_server(app, thisbuild, vcs, build_dir, output_dir, sdk_path, force):
if force:
cmdline += ' --force --test'
cmdline += ' -p ' + app['id'] + ' --vercode ' + thisbuild['vercode']
chan.exec_command(cmdline)
chan.exec_command('bash -c ". ~/.bsenv && ' + cmdline + '"')
output = ''
error = ''
while not chan.exit_status_ready():