makebuildserver: cache defaults to ~/.cache/fdroidserver

[fdroidserver.git] / makebuildserver

diff --git a/makebuildserver b/makebuildserver
index 4fc9a28dbd8816584c658d9f426cc3226c4b43b9..f745b0a3bb9861b5c8711cf353a08fed952ec9b8 100755 (executable)
--- a/makebuildserver
+++ b/makebuildserver
@@ -45,7 +45,15 @@ parser.add_option("--debian-mirror", default="http://http.debian.net/debian/",
                   help="Use the specified Debian mirror in the box's /etc/apt/sources.list.")
 options, args = parser.parse_args()
 
-config = {}
+# set up default config
+config = {
+    'arch64': False,
+    'basebox': 'jessie32',
+    'baseboxurl': 'https://f-droid.org/jessie32.box',
+    'cachedir': os.path.join(os.getenv('HOME'), '.cache', 'fdroidserver'),
+    'cpus': 1,
+    'memory': 3584,
+}
 
 # load config file, if present
 if os.path.exists('makebuildserver.config.py'):
@@ -65,9 +73,9 @@ if options.clean:
     vagrant(['destroy', '-f'], cwd=serverdir, printout=options.verbose)
 
 # Update cached files.
-cachedir = os.path.join('buildserver', 'cache')
+cachedir = config['cachedir']
 if not os.path.exists(cachedir):
-    os.mkdir(cachedir)
+    os.makedirs(cachedir, 0755)
 
 cachefiles = [
     ('android-sdk_r24.4.1-linux.tgz',