From 7faef1f72ef1f14d14e8922690ee915ef4700812 Mon Sep 17 00:00:00 2001 From: Colin P. Mccabe Date: Wed, 22 Nov 2017 10:05:37 -0800 Subject: [PATCH] Rework how gradle.properties is handled Since gradle keeps a lot of temporary junk in the .gradle directory, we don't want that directory to be a symlink into our git repo. --- .gradle.properties | 2 ++ .gradle/gradle.properties | 2 -- install-symlinks.sh | 9 ++++++++- 3 files changed, 10 insertions(+), 3 deletions(-) create mode 100644 .gradle.properties delete mode 100644 .gradle/gradle.properties diff --git a/.gradle.properties b/.gradle.properties new file mode 100644 index 0000000..9049e1e --- /dev/null +++ b/.gradle.properties @@ -0,0 +1,2 @@ +org.gradle.daemon=false +maxParallelForks=1 diff --git a/.gradle/gradle.properties b/.gradle/gradle.properties deleted file mode 100644 index 9049e1e..0000000 --- a/.gradle/gradle.properties +++ /dev/null @@ -1,2 +0,0 @@ -org.gradle.daemon=false -maxParallelForks=1 diff --git a/install-symlinks.sh b/install-symlinks.sh index 820d5b3..3ca68a4 100755 --- a/install-symlinks.sh +++ b/install-symlinks.sh @@ -41,7 +41,7 @@ for file in ${BASEDIR}/.[^.]*; do # skip files which we don't want to link [ "${basefile}" == ".git" ] && continue [ "${basefile}" == ".gitignore" ] && continue - #[ "${basefile}" == ".ssh" ] && continue + [ "${basefile}" == ".ssh" ] && continue pushd .. > /dev/null if [ -L ${basefile} ]; then @@ -65,3 +65,10 @@ if [ $copy_ssh_old -eq 1 ]; then echo "chmod 600 ../.ssh/config" chmod 600 ../.ssh/* fi + +# Install .gradle/.gradle.properties +mkdir -p ../.gradle +pushd ../.gradle +rm -f ./gradle.properties +ln -s ../.gradle.properties ./gradle.properties +popd -- 1.6.6.rc1.39.g9a42