2010-12-28 Ramon Novoa <rnovoa@artica.es>

* pandora_update_version.sh: Update the console installer version. Fixed
	  a bug when reading the build number.



git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@3718 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
This commit is contained in:
Ramon Novoa 2010-12-28 12:44:58 +00:00
parent c714ae6212
commit fac10414f6
2 changed files with 10 additions and 2 deletions

View File

@ -1,3 +1,8 @@
2010-12-28 Ramon Novoa <rnovoa@artica.es>
* pandora_update_version.sh: Update the console installer version. Fixed
a bug when reading the build number.
2010-12-23 Ramon Novoa <rnovoa@artica.es> 2010-12-23 Ramon Novoa <rnovoa@artica.es>
* build_src.sh, build_windows_agent.sh, * build_src.sh, build_windows_agent.sh,

View File

@ -17,7 +17,7 @@ VERSION=$2
if [ $# == 2 ]; then if [ $# == 2 ]; then
BUILD=`date +%g%m%d` BUILD=`date +%g%m%d`
else else
BUILD=$2 BUILD=$3
fi fi
TEMP_FILE="/tmp/pandora_update_version.tmp" TEMP_FILE="/tmp/pandora_update_version.tmp"
CODE_HOME=~/code/pandora/trunk CODE_HOME=~/code/pandora/trunk
@ -35,6 +35,7 @@ $CODE_HOME_ENT/pandora/trunk/pandora_server/PandoraFMS-Enterprise/DEBIAN"
SERVER_FILE="$CODE_HOME/pandora_server/lib/PandoraFMS/Config.pm" SERVER_FILE="$CODE_HOME/pandora_server/lib/PandoraFMS/Config.pm"
CONSOLE_DB_FILE="$CODE_HOME/pandora_console/pandoradb_data.sql" CONSOLE_DB_FILE="$CODE_HOME/pandora_console/pandoradb_data.sql"
CONSOLE_FILE="$CODE_HOME/pandora_console/include/config_process.php" CONSOLE_FILE="$CODE_HOME/pandora_console/include/config_process.php"
CONSOLE_INSTALL_FILE="$CODE_HOME/pandora_console/install.php"
AGENT_UNIX_FILE="$CODE_HOME/pandora_agents/unix/pandora_agent" AGENT_UNIX_FILE="$CODE_HOME/pandora_agents/unix/pandora_agent"
AGENT_WIN_FILE="$CODE_HOME/pandora_agents/win32/pandora.cc" AGENT_WIN_FILE="$CODE_HOME/pandora_agents/win32/pandora.cc"
AGENT_WIN_MPI_FILE="$CODE_HOME/pandora_agents/win32/installer/pandora.mpi" AGENT_WIN_MPI_FILE="$CODE_HOME/pandora_agents/win32/installer/pandora.mpi"
@ -87,7 +88,9 @@ sed -e "s/\s*[(]\s*'db_scheme_version'\s*\,.*/('db_scheme_version'\,'$VERSION'),
sed -e "s/\s*[(]\s*'db_scheme_build'\s*\,.*/('db_scheme_build'\,'PD$BUILD'),/" "$CONSOLE_DB_FILE" > "$TEMP_FILE" && mv "$TEMP_FILE" "$CONSOLE_DB_FILE" sed -e "s/\s*[(]\s*'db_scheme_build'\s*\,.*/('db_scheme_build'\,'PD$BUILD'),/" "$CONSOLE_DB_FILE" > "$TEMP_FILE" && mv "$TEMP_FILE" "$CONSOLE_DB_FILE"
echo "Updating Pandora Console version..." echo "Updating Pandora Console version..."
sed -e "s/\s*\$pandora_version\s*=.*/\$pandora_version = 'v$VERSION';/" "$CONSOLE_FILE" > "$TEMP_FILE" && mv "$TEMP_FILE" "$CONSOLE_FILE" sed -e "s/\s*\$pandora_version\s*=.*/\$pandora_version = 'v$VERSION';/" "$CONSOLE_FILE" > "$TEMP_FILE" && mv "$TEMP_FILE" "$CONSOLE_FILE"
sed -e "s/\s*\$build_version\s*=.*/\$build_version = 'PC$BUILD';/" "$CONSOLE_FILE" > "$TEMP_FILE" && mv "$TEMP_FILE" "$CONSOLE_FILE" echo "Updating Pandora Console installer version..."
sed -e "s/\s*\$version\s*=.*/\$version = '$VERSION';/" "$CONSOLE_INSTALL_FILE" > "$TEMP_FILE" && mv "$TEMP_FILE" "$CONSOLE_INSTALL_FILE"
sed -e "s/\s*\$build\s*=.*/\$build = '$BUILD';/" "$CONSOLE_INSTALL_FILE" > "$TEMP_FILE" && mv "$TEMP_FILE" "$CONSOLE_INSTALL_FILE"
echo "Setting develop_bypass to 0..." echo "Setting develop_bypass to 0..."
sed -e "s/\s*if\s*(\s*[!]\s*isset\s*(\s*$develop_bypass\s*)\s*)\s*$develop_bypass\s*=.*/if ([!]isset($develop_bypass)) $develop_bypass = 0;/" "$CONSOLE_FILE" > "$TEMP_FILE" && mv "$TEMP_FILE" "$CONSOLE_FILE" sed -e "s/\s*if\s*(\s*[!]\s*isset\s*(\s*$develop_bypass\s*)\s*)\s*$develop_bypass\s*=.*/if ([!]isset($develop_bypass)) $develop_bypass = 0;/" "$CONSOLE_FILE" > "$TEMP_FILE" && mv "$TEMP_FILE" "$CONSOLE_FILE"