buildserver: move apt setup to a shell script

[fdroidserver.git] / makebuildserver

diff --git a/makebuildserver b/makebuildserver
index b4c900ef8114d963dd9fa645f31bb8272e25495b..0b1da7331a6f962f4625fdc6ba3a70b477f0c26c 100755 (executable)
--- a/makebuildserver
+++ b/makebuildserver
@@ -377,16 +377,12 @@ vagrantfile += """
 
   config.vm.provision "shell", path: "setup-env-vars",
     args: ["/home/vagrant/android-sdk"]
+  config.vm.provision "shell", path: "provision-apt-get-install",
+    args: ["{0}"]
 
   config.vm.provision :chef_solo do |chef|
     chef.cookbooks_path = "cookbooks"
     chef.log_level = :debug
-    chef.json = {
-      :settings => {
-        :debian_mirror => "%s",
-        :user => "vagrant"
-      }
-    }
     chef.add_recipe "fdroidbuild-general"
     chef.add_recipe "kivy"
   end
@@ -404,7 +400,7 @@ vagrantfile += """
   end
 
 end
-""" % config['debian_mirror']
+""".format(config['debian_mirror'])
 
 
 # Check against the existing Vagrantfile, and if they differ, we need to