upgradeFromGit : Move configuration variables in a local.sh file.

diff --git a/config.local/.gitignore b/config.local/.gitignore
index 518aa97..4021b54 100644 (file)
--- a/config.local/.gitignore
+++ b/config.local/.gitignore
@@ -3,3 +3,4 @@
 *.tpl
 *.tpl~
 *.orig
+*.sh

diff --git a/config.local/local.sh.example b/config.local/local.sh.example
new file mode 100644 (file)
index 0000000..4ea8ad4
--- /dev/null
+++ b/config.local/local.sh.example
@@ -0,0 +1,15 @@
+#!/bin/sh
+
+# List of local files which will be install in web root
+LOCAL_FILES="
+"
+
+LOCAL_SAV_DIR="$ROOT_DIR/config.local"
+LOG_FILE="$ROOT_DIR/upgrade.log"
+
+# The theme name to install (optional)
+#THEME="mytheme"
+
+# Do doc export ?
+DO_DOC=1
+

diff --git a/upgradeFromGit.sh b/upgradeFromGit.sh
index 3a6a046..0fd41e2 100755 (executable)
--- a/upgradeFromGit.sh
+++ b/upgradeFromGit.sh
@@ -1,19 +1,16 @@
 #!/bin/sh
 
-ROOT_DIR=$( cd `dirname $0`; pwd )
-
-# List of local files which will be install in web root
-LOCAL_FILES="
-"
 
-LOCAL_SAV_DIR="$ROOT_DIR/config.local"
-LOG_FILE="$ROOT_DIR/upgrade.log"
+ROOT_DIR=$( cd `dirname $0`; pwd )
 
-# The theme name to install (optional)
-#THEME="inha"
+# Import config
+if [ ! -f $ROOT_DIR/config.local/local.sh ]
+then
+    echo "Error : You don't have create your own local.sh file in config.local directory. You could rely on the local.sh.example file to create your version."
+    exit 1
+fi
 
-# Do doc export ?
-DO_DOC=1
+source $ROOT_DIR/config.local/local.sh
 
 function msg() {
     echo $2 "$1" | tee -a "$LOG_FILE"