From 22e7a984098ab8d6dd1f7e6c986e68b59ca14f31 Mon Sep 17 00:00:00 2001 From: Ramon Novoa Date: Wed, 3 Nov 2010 18:06:30 +0000 Subject: [PATCH] 2010-11-03 Ramon Novoa * pandora_update_version.sh: Set the build in the InstallJammer mpi file. git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@3511 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f --- extras/ChangeLog | 5 +++++ extras/pandora_update_version.sh | 3 ++- 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/extras/ChangeLog b/extras/ChangeLog index f610ffb9e6..5f65c21645 100644 --- a/extras/ChangeLog +++ b/extras/ChangeLog @@ -1,3 +1,8 @@ +2010-11-03 Ramon Novoa + + * pandora_update_version.sh: Set the build in the InstallJammer mpi + file. + 2010-11-03 Ramon Novoa * pandora_update_version.sh: Fixed the regular expression that matches diff --git a/extras/pandora_update_version.sh b/extras/pandora_update_version.sh index d28a23656f..f5fb7a72ac 100755 --- a/extras/pandora_update_version.sh +++ b/extras/pandora_update_version.sh @@ -99,7 +99,8 @@ echo "Updating Pandora Windows Agent version..." sed -e "s/\s*#define\s*PANDORA_VERSION\s*.*/#define PANDORA_VERSION (\"$VERSION(Build $BUILD)\")/" "$AGENT_WIN_FILE" > "$TEMP_FILE" && mv "$TEMP_FILE" "$AGENT_WIN_FILE" sed -e "s/{Pandora FMS Windows Agent v.*}/{Pandora FMS Windows Agent v$VERSION}/" "$AGENT_WIN_MPI_FILE" > "$TEMP_FILE" && mv "$TEMP_FILE" "$AGENT_WIN_MPI_FILE" NUMERIC_VERSION=$(echo $VERSION | sed -e "s/\([0-9]*\.[0-9]*\).*/\1/") -sed -n "1h;1!H;\${;g;s/InstallVersion[\r\n]{\S*}/InstallVersion\n{$NUMERIC_VERSION.0.0}/g;p;}" "$AGENT_WIN_MPI_FILE" > "$TEMP_FILE" && mv "$TEMP_FILE" "$AGENT_WIN_MPI_FILE" +sed -n "1h;1!H;\${;g;s/[\r\n]InstallVersion[\r\n]{\S*}/\nInstallVersion\n{$NUMERIC_VERSION.0.0}/g;p;}" "$AGENT_WIN_MPI_FILE" > "$TEMP_FILE" && mv "$TEMP_FILE" "$AGENT_WIN_MPI_FILE" +sed -n "1h;1!H;\${;g;s/[\r\n]Version[\r\n]{[^\n\r]*}/\nVersion\n{$BUILD}/g;p;}" "$AGENT_WIN_MPI_FILE" > "$TEMP_FILE" && mv "$TEMP_FILE" "$AGENT_WIN_MPI_FILE" rm -f "$TEMP_FILE"