From f6ffbb599795074dce957a75d86880875c9119c5 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Daniel=20Mart=C3=AD?= Date: Mon, 17 Feb 2014 20:01:55 +0100 Subject: [PATCH] Small config fixes --- fdroidserver/init.py | 2 +- sampleconfigs/{config.sample.py => config.py} | 8 ++------ .../{makebs.config.sample.py => makebs.config.py} | 0 3 files changed, 3 insertions(+), 7 deletions(-) rename sampleconfigs/{config.sample.py => config.py} (94%) rename sampleconfigs/{makebs.config.sample.py => makebs.config.py} (100%) diff --git a/fdroidserver/init.py b/fdroidserver/init.py index db11465e..d6f8a504 100644 --- 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 af611446..b9525459 100644 --- 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 -- 2.30.2