Author: Lars Michelsen <[email protected]>
Date: Sun Nov 4 17:01:36 2012 +0100
Committer: Lars Michelsen <[email protected]>
Commit-Date: Sun Nov 4 17:01:36 2012 +0100
Minor output improvements in installer scripts
---
.f12 | 6 ++++--
ChangeLog | 1 +
install_lib | 1 -
omd_install.sh | 4 +++-
share/userfiles/scripts/std_lq.php | 2 +-
5 files changed, 9 insertions(+), 5 deletions(-)
diff --git a/.f12 b/.f12
index 5f40887..fef6406 100755
--- a/.f12
+++ b/.f12
@@ -2,6 +2,7 @@
[ -z $SITE ] && SITE=lancom
which sudo >/dev/null 2>&1 && SUDO=sudo || SUDO=
+BASE=$(pwd)
#
# Install to /usr/local/nagvis
@@ -17,8 +18,9 @@ $SUDO rm -f /etc/apache2/conf.d/nagvis.conf.*
#
# Install to omd site local/
#
-$SUDO su - $SITE -c "[ ! -d /omd/sites/$SITE/nvsrc ] && mkdir
/omd/sites/$SITE/nvsrc ; \
-rsync --filter='- .git' --filter='- .*.swp' -av ./ /omd/sites/$SITE/nvsrc/ ; \
+$SUDO su - $SITE -c "[ ! -d /omd/sites/$SITE/nvsrc ] && mkdir
/omd/sites/$SITE/nvsrc || rm -rf /omd/sites/$SITE/nvsrc; \
+cd $BASE ; \
+rsync --filter='- .git' --filter='- .*.swp' -a ./ /omd/sites/$SITE/nvsrc/ ; \
cd /omd/sites/$SITE/nvsrc/ ; \
yes y | ./omd_install.sh"
diff --git a/ChangeLog b/ChangeLog
index 9d48924..9dc2253 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -4,6 +4,7 @@ Core:
* Bugfix: Fixed invalid json output on uncached geomap rendering
* Livestatus-Backend: Using Columns header instead of the deprecated
StatsGroupBy header (maybe you need to update livestatus)
+ * Minor output improvements in installer scripts
Frontend:
* Hiding rotations table on overview page when no rotations configured
diff --git a/install_lib b/install_lib
index ed08918..4bc2a1f 100644
--- a/install_lib
+++ b/install_lib
@@ -55,7 +55,6 @@ cmp() {
cmp_js() {
pushd $1 >/dev/null
- pwd
OUT=NagVisCompressed.js
>$OUT
cmp ExtStacktrace.js
diff --git a/omd_install.sh b/omd_install.sh
index 823dc13..0cc129a 100755
--- a/omd_install.sh
+++ b/omd_install.sh
@@ -211,7 +211,9 @@ patch -s
$OMD_ROOT/local/share/nagvis/htdocs/server/core/defines/global.php <<EO
EOF
# Cleanup temporary files
-find $OMD_ROOT/tmp/nagvis -type f -exec rm {} \;
+if [ -d $OMD_ROOT/tmp/nagvis ]; then
+ find $OMD_ROOT/tmp/nagvis -type f -exec rm {} \;
+fi
omd reload apache
diff --git a/share/userfiles/scripts/std_lq.php
b/share/userfiles/scripts/std_lq.php
index 5d979dd..f2a4a39 100644
--- a/share/userfiles/scripts/std_lq.php
+++ b/share/userfiles/scripts/std_lq.php
@@ -87,7 +87,7 @@ try {
// -> Save to session if logon module told to do so!
$logonModule = 'Core' . cfg('global', 'logonmodule');
$logonModule = $logonModule == 'CoreLogonDialog' ?
'CoreLogonDialogHandler' : $logonModule;
- $MODULE = new $logonModule($CORE);
+ $MODULE = new $logonModule(GlobalCore::getInstance());
$ret = $MODULE->check();
}
------------------------------------------------------------------------------
LogMeIn Central: Instant, anywhere, Remote PC access and management.
Stay in control, update software, and manage PCs from one command center
Diagnose problems and improve visibility into emerging IT issues
Automate, monitor and manage. Do more in less time with Central
http://p.sf.net/sfu/logmein12331_d2d
_______________________________________________
Nagvis-checkins mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/nagvis-checkins
