From 3596c159e1df40ccda59ae8a3a81b8d44c5e6c3c Mon Sep 17 00:00:00 2001
From: Andreas Brachold <vdr07@deltab.de>
Date: Thu, 1 Apr 2010 15:10:29 +0000
Subject: =?UTF-8?q?update-xxv:=20add=20a=20new=20password=20option=20"-A?=
 =?UTF-8?q?=20Ask=20for=20password=20only=20once"=20(Thanks=20to=20Matthia?=
 =?UTF-8?q?s=20W=C3=A4chter)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 contrib/update-xxv | 13 +++++++++----
 doc/CHANGELOG      |  2 ++
 2 files changed, 11 insertions(+), 4 deletions(-)

diff --git a/contrib/update-xxv b/contrib/update-xxv
index f94facb..cc40981 100755
--- a/contrib/update-xxv
+++ b/contrib/update-xxv
@@ -10,7 +10,8 @@
 #          -d <database>  : XXV database name (default: xxv)
 #          -u <user>      : Username (default: root)
 #          -p <password>  : Password (default: no password)
-#          -a             : Ask for password
+#          -a             : Ask for password (once every run of mysql)
+#          -A             : Ask for password (just once)
 #          -f             : Force upgrade, do not check version
 #          -v             : Display actual Version
 #          -h             : Help
@@ -44,7 +45,8 @@ showHelp()
     echo '-u <user>      : Username (default: root)'
     echo '-p <password>  : Password (default: no password)'
     echo '-s <sql-file>  : Upgrade sql script (default: upgrade-xxv-db.sql)'
-    echo '-a             : Ask for password'
+    echo '-a             : Ask for password (once every run of mysql)'
+    echo '-A             : Ask for password (just once)'
     echo '-f             : Force upgrade, do not check version'
     echo '-v             : Display actual version'
     echo '-h             : Help'
@@ -248,9 +250,12 @@ while [ $# -ge 1 ] ; do
         -s)
             $upgrade=$2 ; shift
         ;;
-    	-a)
+    	  -a)
             askPassword='true'
-    	;;
+    	  ;;
+	      -A)
+	          read -s -p 'Enter Password (hidden): ' password
+	      ;;
         -f)
             isForceUpdate='true'
         ;;
diff --git a/doc/CHANGELOG b/doc/CHANGELOG
index 754cde9..2d3bcfb 100644
--- a/doc/CHANGELOG
+++ b/doc/CHANGELOG
@@ -6,6 +6,7 @@ Core changes:
 * Support new filestructure (since VDR-1.7.3) (REQUEST #15540)
 * Add italian translation (Thanks to Diego Pierotto)
 * Changed database layout version 32
+* update-xxv: add a new password option "-A Ask for password only once" (Thanks to Matthias Wächter)
 
   AUTOTIMER:
 * adjust timer himself, before create new autotimer
@@ -48,6 +49,7 @@ Core changes:
   RECORDS:
 * improve find files (Fix Bug #16516)
 * support new filestructure (since VDR-1.7.3) (REQUEST #15540)
+* rewrite rconvert 
 
   TIMERS:
 * adjust inactive timer too (avoid double created autotimer)
-- 
cgit v1.2.3