]> xenbits.xensource.com Git - raisin.git/commitdiff
raisin: remove duplicate source config in raise
authorStefano Stabellini <stefano.stabellini@eu.citrix.com>
Tue, 21 Apr 2015 15:42:33 +0000 (15:42 +0000)
committerStefano Stabellini <stefano.stabellini@eu.citrix.com>
Tue, 21 Apr 2015 15:42:33 +0000 (15:42 +0000)
Signed-off-by: Stefano Stabellini <stefano.stabellini@eu.citrix.com>
Acked-by: George Dunlap <george.dunlap@eu.citrix.com>
raise

diff --git a/raise b/raise
index bce69081c7fc7230eadd1cf8ffb7407b10ed0beb..68dbfd8b4a937da07733e1de6a5ab9de2c80ab08 100755 (executable)
--- a/raise
+++ b/raise
@@ -17,9 +17,12 @@ _help() {
 }
 
 # Include your defaults
-if [[ -e "./config" ]] ; then
-    . ./config
+if [[ ! -e "./config" ]]
+then
+   echo "No config file found, copying default config"
+   cp defconfig config
 fi
+source ./config
 
 # To use this as a library, set RAISIN_PATH appropriately
 [[ -z "$RAISIN_PATH" ]] && RAISIN_PATH="$PWD/lib"
@@ -29,14 +32,6 @@ source ${RAISIN_PATH}/common-functions.sh
 source ${RAISIN_PATH}/git-checkout.sh
 source ${RAISIN_PATH}/commands.sh
 
-# Include your defaults
-if [[ ! -e "./config" ]] ; then
-   echo "No config file found, copying default config"
-   cp defconfig config
-fi
-
-source ./config
-
 # Set up basic functionality
 common_init