X-Git-Url: http://ftp.carnet.hr/carnet-debian/scm?p=carnet-tools-cn.git;a=blobdiff_plain;f=functions.sh;fp=functions.sh;h=dc2d45c0c793fb589aac9bb0045f6272b60c589a;hp=851be629fb86e6c708b009ee80f7c7020a7a6ec6;hb=0391d17254435cc342c65e2277edb13c7c9cb093;hpb=202aaca8f6a163482403c104ff192a0375496646

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
 }