acgvision-agent (5.1.4-6) debian-changes-5.1.4-6

Summary

 bin/acgvision-agent-conf |   29 +++++++++++++++++++++++------
 src/META-INF/MANIFEST.MF |    1 -
 2 files changed, 23 insertions(+), 7 deletions(-)

    
download this patch

Patch contents

Description: Upstream changes introduced in version 5.1.4-6
 This patch has been created by dpkg-source during the package build.
 Here's the last changelog entry, hopefully it gives details on why
 those changes were made:
 .
 acgvision-agent (5.1.4-6) unstable; urgency=low
 .
   - Improving description format.(Closes: #584937)
   * Purging  /var/log/acgvision on remove.
   * Adding default options on configuration script.
   * Removing extension on config file for acg scripts.
   * Removing $time from init.d script.(Closes: #585879)
   * Removing java:depends from dependencies and filling dependencies manually (Closes: #586783)
   * Removing junit tests on build.
 .
 The person named in the Author field signed this changelog entry.
Author: RĂ©mi Debay <remi.debay@acgcenter.com>
Bug-Debian: http://bugs.debian.org/584937
Bug-Debian: http://bugs.debian.org/585879
Bug-Debian: http://bugs.debian.org/586783

---
The information above should follow the Patch Tagging Guidelines, please
checkout http://dep.debian.net/deps/dep3/ to learn about the format. Here
are templates for supplementary fields that you might want to add:

Origin: <vendor|upstream|other>, <url of original patch>
Bug: <url in upstream bugtracker>
Bug-Debian: http://bugs.debian.org/<bugnumber>
Bug-Ubuntu: https://launchpad.net/bugs/<bugnumber>
Forwarded: <no|not-needed|url proving that it has been forwarded>
Reviewed-By: <name and email of someone who approved the patch>
Last-Update: <YYYY-MM-DD>

--- acgvision-agent-5.1.4.orig/src/META-INF/MANIFEST.MF
+++ acgvision-agent-5.1.4/src/META-INF/MANIFEST.MF
@@ -1,4 +1,3 @@
 Manifest-Version: 1.0
-Ant-Version: Apache Ant 1.7.1
 Main-Class: com.acgvision.agent.run.Main
 Class-Path: commons-cli.jar log4j-1.2.jar commons-configuration.jar commons-lang.jar commons-logging.jar commons-collections3.jar
--- acgvision-agent-5.1.4.orig/bin/acgvision-agent-conf
+++ acgvision-agent-5.1.4/bin/acgvision-agent-conf
@@ -5,6 +5,9 @@
 #
 ##########################################
 CONFIGFILE="/etc/acgvision/agent.ini"
+defaultadress="acgvision.acgcenter.com"
+defaultport="8181"
+defaultprotocole="https"
 
 echo "Using configuration file : $CONFIGFILE" 
 
@@ -14,18 +17,32 @@ echo "[User]"> $CONFIGFILE
 echo "email=$email" >> $CONFIGFILE 
 echo "" >> $CONFIGFILE 
 
-echo -n "ACGVision Server Address [acgvision.acgcenter.com] ?"
+echo -n "ACGVision Server Address [$defaultadress] ?"
 read address
 echo "[Server]">> $CONFIGFILE 
+if [ ! $address ]
+then
+address=$defaultadress
+fi
 echo "address=$address" >> $CONFIGFILE 
 
-echo -n "ACGVision Server PORT [8181] ?"
+echo -n "ACGVision Server PORT [$defaultport] ?"
 read port
+if [ ! $port ]
+then
+port=$defaultport
+fi
+
 echo "port=$port" >> $CONFIGFILE 
 echo "" >> $CONFIGFILE 
 
-echo -n "ACGVision Server PROTOCOLE [https] ?"
+echo -n "ACGVision Server PROTOCOLE [$defaultprotocole] ?"
 read protocole
+if [ ! $protocole ]
+then
+protocole=$defaultprotocole
+fi
+
 echo "protocole=$protocole" >> $CONFIGFILE
 echo "" >> $CONFIGFILE
 
@@ -52,9 +69,9 @@ else
 fi
 
 echo "[Commands]">> $CONFIGFILE 
-echo "cpu = /usr/sbin/acgMeasureCpu.ksh">> $CONFIGFILE 
-echo "filesystem = /usr/sbin/acgMeasureFileSystem.ksh">> $CONFIGFILE 
-echo "memory = /usr/sbin/acgMeasureMemory.ksh">>	$CONFIGFILE 
+echo "cpu = /usr/sbin/acgMeasureCpu">> $CONFIGFILE 
+echo "filesystem = /usr/sbin/acgMeasureFileSystem">> $CONFIGFILE 
+echo "memory = /usr/sbin/acgMeasureMemory">>	$CONFIGFILE 
 
 echo "" >> $CONFIGFILE