From: Ivan Rako <Ivan.Rako@CARNet.hr>
Date: Wed, 19 Mar 2008 16:51:57 +0000 (+0100)
Subject: Uvoz u git: carnet-tools-cn 2.8.1
X-Git-Tag: debian/3.0.0~7
X-Git-Url: http://ftp.carnet.hr/carnet-debian/scm?a=commitdiff_plain;h=0391d17254435cc342c65e2277edb13c7c9cb093;p=carnet-upgrade.git

Uvoz u git: carnet-tools-cn 2.8.1

* Kozmeticke ispravke u funkcijama cp_yes_no() i cp_mail()
* cp_mv() ostavlja kopiju stare datoteke
---

diff --git a/debian/changelog b/debian/changelog
index 432fbe2..88a15a0 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+carnet-tools-cn (2.8.1) stable; urgency=low
+
+  * Kozmeticke ispravke u funkcijama cp_yes_no() i cp_mail()
+  * cp_mv() ostavlja kopiju stare datoteke
+
+ -- Ivan Rako <Ivan.Rako@CARNet.hr>  Mon,  4 Feb 2008 23:47:02 +0100
+
 carnet-tools-cn (2.8) stable; urgency=low
 
   * Prva verzija za Etch
diff --git a/functions.sh b/functions.sh
index 851be62..dc2d45c 100644
--- a/functions.sh
+++ b/functions.sh
@@ -327,7 +327,7 @@ cp_mail () {
     CP_NOTICE="From: $pkg postinst script <root>
 To: root
 Subject: $pkg$version package install log
-Date: $(/bin/date +'%a, %d %b %Y %H:%M:%S %z')
+Date: $(LC_ALL=C /bin/date --rfc-2822)
  
 Hello!
 
@@ -338,7 +338,7 @@ is included below.
 ----------
 ${CP_NOTICE}----------"
   
-    echo "$CP_NOTICE" | /usr/sbin/sendmail -t &
+    echo "$CP_NOTICE" | /usr/sbin/sendmail -t -oi &
     sleep 1
   fi
 }
@@ -356,6 +356,7 @@ cp_mv () {
   if [ -e "$old" ]; then
     chown --reference "$old" "$new"
     chmod --reference "$old" "$new"
+    cp -pf "$old" "$old.cn-old"
   fi
   mv "$new" "$old"
 }
@@ -378,6 +379,14 @@ cp_yes_no () {
   echo -n "$prompt (y)es/(n)o: "
   read answer
   case "$answer" in
+    Y*)
+      echo
+      RET=y
+      ;;
+    N*)
+      echo
+      RET=n
+      ;;
     y*)
       echo
       RET=y
@@ -389,7 +398,7 @@ cp_yes_no () {
     *)
       echo
       echo "Please read the message and choose y or n"
-      cp_yes_no
+      cp_yes_no "$prompt"
       ;;
   esac
 }