all: add NDK r12b and set it as default

[fdroidserver.git] / fdroidserver / init.py

diff --git a/fdroidserver/init.py b/fdroidserver/init.py
index 590307d9e8606a3a96edc8ebc1cc9e614ae337f1..f29b2d53891057e33bf117363c177092f677865f 100644 (file)
--- a/fdroidserver/init.py
+++ b/fdroidserver/init.py
@@ -1,6 +1,6 @@
 #!/usr/bin/env python3
 #
-# update.py - part of the FDroid server tools
+# init.py - part of the FDroid server tools
 # Copyright (C) 2010-2013, Ciaran Gultnieks, ciaran@ciarang.com
 # Copyright (C) 2013-2014 Daniel Martí <mvdan@mvdan.cc>
 # Copyright (C) 2013 Hans-Christoph Steiner <hans@eds.org>
@@ -35,12 +35,12 @@ options = None
 
 def disable_in_config(key, value):
     '''write a key/value to the local config.py, then comment it out'''
-    with open('config.py', 'r') as f:
+    with open('config.py', 'r', encoding='utf8') as f:
         data = f.read()
     pattern = '\n[\s#]*' + key + '\s*=\s*"[^"]*"'
     repl = '\n#' + key + ' = "' + value + '"'
     data = re.sub(pattern, repl, data)
-    with open('config.py', 'w') as f:
+    with open('config.py', 'w', encoding='utf8') as f:
         f.writelines(data)
 
 
@@ -100,6 +100,9 @@ def main():
         else:
             # if neither --android-home nor the default sdk_path exist, prompt the user
             default_sdk_path = '/opt/android-sdk'
+            if sys.platform == 'win32' or sys.platform == 'cygwin':
+                default_sdk_path = os.path.join(os.getenv('USERPROFILE'),
+                                                'AppData', 'Local', 'Android', 'android-sdk')
             while not options.no_prompt:
                 try:
                     s = input('Enter the path to the Android SDK ('
@@ -232,7 +235,7 @@ def main():
     logging.info('  Android SDK:\t\t\t' + config['sdk_path'])
     if aapt:
         logging.info('  Android SDK Build Tools:\t' + os.path.dirname(aapt))
-    logging.info('  Android NDK r10e (optional):\t$ANDROID_NDK')
+    logging.info('  Android NDK r12b (optional):\t$ANDROID_NDK')
     logging.info('  Keystore for signing key:\t' + keystore)
     if repo_keyalias is not None:
         logging.info('  Alias for key in store:\t' + repo_keyalias)