diff --git a/.gitignore b/.gitignore new file mode 100644 index 00000000..efed14a7 --- /dev/null +++ b/.gitignore @@ -0,0 +1 @@ +upgrade.log diff --git a/config.local/.gitignore b/config.local/.gitignore new file mode 100644 index 00000000..518aa97a --- /dev/null +++ b/config.local/.gitignore @@ -0,0 +1,5 @@ +*.php +*.php~ +*.tpl +*.tpl~ +*.orig diff --git a/config.local/.placefolder b/config.local/.placefolder new file mode 100644 index 00000000..e69de29b diff --git a/upgradeFromGit.sh b/upgradeFromGit.sh new file mode 100755 index 00000000..19a6726f --- /dev/null +++ b/upgradeFromGit.sh @@ -0,0 +1,188 @@ +#!/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" + +# The theme name to install (optional) +#THEME="inha" + +# Do doc export ? +DO_DOC=1 + +function msg() { + echo $2 "$1" | tee -a "$LOG_FILE" +} + +cd $ROOT_DIR + +msg "Clean git repos : " +for i in $LOCAL_FILES +do + msg "\t-> $i :" -en + if [ -L $i ] + then + msg + msg "\t\t-> Delete file : " -en + rm -fr $i >> $LOG_FILE 2>&1 + if [ $? -gt 0 ] + then + msg "Error" + exit 1 + else + msg "Ok" + fi + if [ -f $i.sav ] + then + msg "\t\t-> Restore orignal file : " -en + mv $i.sav $i >> $LOG_FILE 2>&1 + if [ $? -gt 0 ] + then + msg "Error" + exit 1 + else + msg "Ok" + fi + fi + else + msg "file does not exist, pass..." + fi +done + +if [ $DO_DOC -eq 1 ] +then + msg "-> Clean de la doc :" -en + cd $SVN_DIR/doc >> $LOG_FILE && make clean >> $LOG_FILE && cd - >> $LOG_FILE + if [ $? -gt 0 ] + then + msg "Error" + exit 1 + else + msg "Ok" + fi +fi + +if [ "$THEME" != "" ] +then + msg "\t\t-> Remove theme : " -en + rm -f $SVN_DIR/trunk/templates/$THEME $SVN_DIR/trunk/images/$THEME $SVN_DIR/trunk/css/$THEME >> $LOG_FILE 2>&1 + if [ $? -gt 0 ] + then + msg "Error" + exit 1 + else + msg "Ok" + fi +fi + +msg "Verification of git repos state : " +git status >> $LOG_FILE 2>&1 +if [ "$ETAT" != "" ] +then + msg "\n\t-> [Error] Some changes have been made to source code since the last update." -e + exit 1 +fi +msg "\t->[OK]" -e + +msg "Upgrade git repos : " +RES_GIT=`git pull` +RES=$? +msg "$RES_GIT" -e +if [ $RES -gt 0 ] +then + msg "\t-> [Error] Problem during git repos pull." -e + exit 1 +fi +msg "\t-> [OK]" -e + +msg "Install local files : " +for i in $LOCAL_FILES +do + msg "\t-> $i : " -ne + SRC="$LOCAL_SAV_DIR/`basename $i`" + if [ -f $SRC ] + then + msg + if [ -f $SVN_DIR/$i ] + then + msg "\t\t-> Backup original file : " -en + mv $SVN_DIR/$i $SVN_DIR/$i.sav >> $LOG_FILE 2>&1 + if [ $? -gt 0 ] + then + msg "Error" + exit 1 + fi + msg "Ok" + + msg "\t\t-> Check possible change of the original file since last upgrade : " -en + if [ -f $SRC.orig ] + then + DIFF=`diff $SVN_DIR/$i.sav $SRC.orig` + msg "$DIFF" -e + if [ "$DIFF" != "" ] + then + msg "\n\t\t\t-> Caution : This file changed. Do you want edit this file now ? [y/N] " -en + read a + echo "Reponse : $a" >> $LOG_FILE + if [ "$a" == "y" -o "$a" == "Y" ] + then + vi -d $SRC $SVN_DIR/$i.sav + fi + else + msg "No change" + fi + else + echo + fi + msg "\t\t-> Backup file for next upgrade : " -en + cp -f $SVN_DIR/$i.sav $SRC.orig >> $LOG_FILE 2>&1 + if [ $? -gt 0 ] + then + msg "Error" + exit 1 + fi + msg "Ok" + fi + msg "\t\t-> Install local file : " -en + ln -s $SRC $SVN_DIR/$i >> $LOG_FILE 2>&1 + if [ $? -gt 0 ] + then + msg "Error" + exit 1 + fi + msg "Ok" + else + msg "file does not exist. Pass..." + fi +done +if [ "$THEME" != "" ] +then + msg "-> Install theme : " -en + ln -s $LOCAL_SAV_DIR/theme/templates $SVN_DIR/trunk/templates/$THEME >> $LOG_FILE 2>&1 + ln -s $LOCAL_SAV_DIR/theme/images $SVN_DIR/trunk/images/$THEME >> $LOG_FILE 2>&1 + ln -s $LOCAL_SAV_DIR/theme/css $SVN_DIR/trunk/css/$THEME >> $LOG_FILE 2>&1 + msg "Ok" +fi + +if [ $DO_DOC -eq 1 ] +then + msg "-> Do you want export the documentation (y/N) ? " -en + read a + if [ "$a" == "y" -o "$a" == "Y" ] + then + msg "-> Compile de la doc :" -en + cd $SVN_DIR/doc >> $LOG_FILE && make >> $LOG_FILE && cd - >> $LOG_FILE + if [ $? -gt 0 ] + then + msg "Error" + exit 1 + else + msg "Ok" + fi + fi +fi