Commit 90f59ef4 authored by Simon Braß's avatar Simon Braß
Browse files

[NAG] fix order of variable declaration in install

parent d2bcd12c
......@@ -27,14 +27,17 @@ function unpack_arch {
local ARCH=$1
local FILE=$2
UNPACK_DIR=`tar -tf ${FILE} 2>/dev/null | grep -e '/$' -m 1`
UNPACK_DIR=`tar -tf ${FILE} 2>/dev/null | grep -e '/$' -m 1`
rm -rf $UNPACK_DIR
tar xf $FILE
tar xf $FILE
}
function install_arch {
local ARCH=$1
local FILE=$2
cd $UNPACK_DIR
local REVISION=5 #`bin/nagfor 2>&1 | grep -o -E "([0-9]{4})"`
local OLD_REVISION=""
local LATEST_VERSION=nagfor-${NAG_MAJOR}.${NAG_MINOR}-LATEST
local FULL_VERSION=nagfor-${NAG_MAJOR}.${NAG_MINOR}-$REVISION
......@@ -48,11 +51,9 @@ function install_arch {
then
OLD_REVISION=`ls -la $NAG_LATEST | awk '{print $NF}' | cut -d "-" -f 3`
else
OLD_REVISION=1000
OLD_REVISION=-1
fi
echo FILE=$FILE
cd $UNPACK_DIR
local REVISION=`bin/nagfor 2>&1 | grep -o -E "([0-9]{4})"`
echo REVISION=$REVISION
echo OLD_REVISION=$OLD_REVISION
if [ "$OLD_REVISION" -lt "$REVISION" ]
......@@ -65,7 +66,7 @@ $NAG_PREFIX/man/man3
3
jenkins
jenkins
"| ${WORKSPACE}/nagfor-install.sh
"| sh INSTALL.sh
cd ..
# cp nag.licence $NAG_PREFIX/lib
rm -rf ${NAG_DEST_BASE}
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment