mirror of
https://github.com/f-droid/fdroidserver.git
synced 2025-11-15 19:50:29 +03:00
buildserver: setup env vars using standard script
bash provides a standard file location for a script to be run when the shell starts: /etc/profile.d/ This converts the scattered bits of code for making ~/.bsenv into a single provisioning script to generate /etc/profile.d/bsenv.sh, which gets automatically executed when bash starts
This commit is contained in:
parent
721b3b79a6
commit
e449d2f583
5 changed files with 23 additions and 13 deletions
|
|
@ -97,12 +97,6 @@ easy_install_package "compare-locales" do
|
|||
action :install
|
||||
end
|
||||
|
||||
execute "add-bsenv" do
|
||||
user user
|
||||
command "echo \". ./.bsenv \" >> /home/#{user}/.bashrc"
|
||||
not_if "grep bsenv /home/#{user}/.bashrc"
|
||||
end
|
||||
|
||||
execute "set-default-java" do
|
||||
command "update-java-alternatives --set java-1.7.0-openjdk-i386"
|
||||
end
|
||||
|
|
|
|||
|
|
@ -40,9 +40,3 @@ EOF
|
|||
chmod a+x /opt/gradle/bin/gradle
|
||||
"
|
||||
end
|
||||
|
||||
execute "add-android-ndk-path" do
|
||||
user user
|
||||
command "echo \"export PATH=\\$PATH:/opt/gradle/bin #PATH-GRADLE\" >> /home/#{user}/.bsenv"
|
||||
not_if "grep PATH-GRADLE /home/#{user}/.bsenv"
|
||||
end
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue