Small config fixes

diff --git a/fdroidserver/init.py b/fdroidserver/init.py
index db11465e543199860a87e9fff847e587b1b9a660..d6f8a5049adb1a9037d2235aaed983208daee1c6 100644 (file)
--- a/fdroidserver/init.py
+++ b/fdroidserver/init.py
@@ -104,7 +104,7 @@ def main():
         # 'metadata' and 'tmp' are created in fdroid
         os.mkdir('repo')
         shutil.copy(os.path.join(examplesdir, 'fdroid-icon.png'), fdroiddir)
-        shutil.copyfile(os.path.join(examplesdir, 'config.sample.py'), 'config.py')
+        shutil.copyfile(os.path.join(examplesdir, 'sampleconfigs', 'config.py'), 'config.py')
         os.chmod('config.py', 0o0600)
     else:
         logging.info('Looks like this is already an F-Droid repo, cowardly refusing to overwrite it...')

diff --git a/sampleconfigs/config.sample.py b/sampleconfigs/config.py
similarity index 94%
rename from sampleconfigs/config.sample.py
rename to sampleconfigs/config.py
index af6114468c5db4d0ff6a026cf843e3a6d0506ba5..b9525459a7fcba33568a92c6c8af1dae3853c88a 100644 (file)
--- a/sampleconfigs/config.sample.py
+++ b/sampleconfigs/config.py
@@ -3,15 +3,11 @@
 # Copy this file to config.py, then amend the settings below according to
 # your system configuration.
 
-# Path to the Android SDK, $ANDROID_HOME already set on most systems
+# Override the path to the Android SDK, $ANDROID_HOME by default
 #sdk_path = "/path/to/android-sdk"
-sdk_path = "$ANDROID_HOME"
 
-# Path to the Android NDK, $ANDROID_NDK already set on most systems
-# Legacy toolchains are only needed by some apps
+# Override the path to the Android NDK, $ANDROID_NDK by default
 #ndk_path = "/path/to/android-ndk"
-ndk_path = "$ANDROID_NDK"
-
 # Build tools version to be used
 build_tools = "19.0.1"
 

diff --git a/sampleconfigs/makebs.config.sample.py b/sampleconfigs/makebs.config.py
similarity index 100%
rename from sampleconfigs/makebs.config.sample.py
rename to sampleconfigs/makebs.config.py