Author: Lars Michelsen <[email protected]>
Date: Tue Aug 30 22:37:48 2011 +0200
Committer: Lars Michelsen <[email protected]>
Commit-Date: Tue Aug 30 22:37:48 2011 +0200
Installer skips .gitignore files during installation now
---
ChangeLog | 1 +
install.sh | 7 ++++---
2 files changed, 5 insertions(+), 3 deletions(-)
diff --git a/ChangeLog b/ChangeLog
index b2b8394..8230efe 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -5,6 +5,7 @@ Core
* Bugfix: Fixed login problems in opera (Not setting auth cookie when
using ip addresses as host address
* Removed option "-B" from installer, it is not needed anymore
+ * Installer skips .gitignore files during installation now
* Added exclude_members and exclude_member_states options to stateful
objects for excluding specific member objects completely or only during
summary
state calculations.
diff --git a/install.sh b/install.sh
index 2e32c06..76eba5a 100755
--- a/install.sh
+++ b/install.sh
@@ -836,7 +836,8 @@ copy() {
fi
else
if [ -d "$3" ]; then
- cp -pr $2 $3
+ #cp -pr $2 $3
+ rsync -a -f "- .gitignore" $2 $3
chk_rc "| Error copying $2 to $3" "$DONE"
fi
fi
@@ -1353,7 +1354,7 @@ makedir "$NAGVIS_PATH/var/tmpl/compile"
makedir "$NAGVIS_PATH/share/var"
# Copy all desired files
LINE="Copying files to $NAGVIS_PATH..."
-copy "" "share" "$NAGVIS_PATH"
+copy "\.gitignore$" "share" "$NAGVIS_PATH"
copy "" "etc" "$NAGVIS_PATH"
makedir "$NAGVIS_PATH/etc/profiles"
copy "" "LICENCE README" "$NAGVIS_PATH"
@@ -1525,7 +1526,7 @@ if [ "$INSTALLER_ACTION" = "update" -a "$NAGVIS_VER_OLD"
!= "UNKNOWN" ]; then
copy "" "$AUTH_BACKUP" "auth backup file"
LINE="Restoring custom stylesheets..."
- copy "" "$USERFILES_DIR/styles" "stylesheets"
+ copy "\.gitignore$" "$USERFILES_DIR/styles" "stylesheets"
else
# This is a cross version update. For example from 1.4x to 1.5x
LINE="Restoring main configuration file..."
------------------------------------------------------------------------------
Special Offer -- Download ArcSight Logger for FREE!
Finally, a world-class log management solution at an even better
price-free! And you'll get a free "Love Thy Logs" t-shirt when you
download Logger. Secure your free ArcSight Logger TODAY!
http://p.sf.net/sfu/arcsisghtdev2dev
_______________________________________________
Nagvis-checkins mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/nagvis-checkins
