From 6917b236ab12a59d01e65fd62a1ee363110cfe7a Mon Sep 17 00:00:00 2001
From: Ivan Davidov <davidov.i@gmail.com>
Date: Mon, 4 Dec 2017 18:16:42 +0200
Subject: [PATCH] Use local configuration (vim editor).

---
 src/.config                               | 6 ------
 src/minimal_overlay/bundles/vim/.config   | 5 +++++
 src/minimal_overlay/bundles/vim/01_get.sh | 8 +++-----
 3 files changed, 8 insertions(+), 11 deletions(-)
 create mode 100644 src/minimal_overlay/bundles/vim/.config

diff --git a/src/.config b/src/.config
index e4aa69e8d..b3543a4e4 100644
--- a/src/.config
+++ b/src/.config
@@ -41,12 +41,6 @@ SYSLINUX_SOURCE_URL=http://kernel.org/pub/linux/utils/boot/syslinux/syslinux-6.0
 #                                                                   #
 #####################################################################
 
-# You can find the latest vim source bundles here:
-#
-#   https://github.com/vim/vim/releases
-#
-VIM_SOURCE_URL=https://github.com/vim/vim/archive/v8.0.1298.tar.gz
-
 # You can find the latest ZLIB source bundles here:
 #
 #   http://zlib.net
diff --git a/src/minimal_overlay/bundles/vim/.config b/src/minimal_overlay/bundles/vim/.config
new file mode 100644
index 000000000..83e40ea49
--- /dev/null
+++ b/src/minimal_overlay/bundles/vim/.config
@@ -0,0 +1,5 @@
+# You can find the latest vim source bundles here:
+#
+#   https://github.com/vim/vim/releases
+#
+VIM_SOURCE_URL=https://github.com/vim/vim/archive/v8.0.1298.tar.gz
diff --git a/src/minimal_overlay/bundles/vim/01_get.sh b/src/minimal_overlay/bundles/vim/01_get.sh
index b4ae13fad..c52484211 100755
--- a/src/minimal_overlay/bundles/vim/01_get.sh
+++ b/src/minimal_overlay/bundles/vim/01_get.sh
@@ -4,15 +4,13 @@ set -e
 
 . ../../common.sh
 
-# Grab everything after the '=' character.
-DOWNLOAD_URL=$(grep -i VIM_SOURCE_URL $MAIN_SRC_DIR/.config | cut -f2 -d'=')
+# Read the common configuration properties.
+DOWNLOAD_URL=`read_property VIM_SOURCE_URL`
+USE_LOCAL_SOURCE=`read_property USE_LOCAL_SOURCE`
 
 # Grab everything after the last '/' character.
 ARCHIVE_FILE=${DOWNLOAD_URL##*/}
 
-# Read the 'USE_LOCAL_SOURCE' property from '.config'
-USE_LOCAL_SOURCE="$(grep -i USE_LOCAL_SOURCE $MAIN_SRC_DIR/.config | cut -f2 -d'=')"
-
 if [ "$USE_LOCAL_SOURCE" = "true" -a ! -f $MAIN_SRC_DIR/source/overlay/$ARCHIVE_FILE  ] ; then
   echo "Source bundle $MAIN_SRC_DIR/source/overlay/$ARCHIVE_FILE is missing and will be downloaded."
   USE_LOCAL_SOURCE="false"