projects
/
carnet-tools-cn.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Uvoz u git: carnet-tools-cn 2.8.1
[carnet-tools-cn.git]
/
functions.sh
diff --git
a/functions.sh
b/functions.sh
index
851be62
..
dc2d45c
100644
(file)
--- 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
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!
Hello!
@@
-338,7
+338,7
@@
is included below.
----------
${CP_NOTICE}----------"
----------
${CP_NOTICE}----------"
- echo "$CP_NOTICE" | /usr/sbin/sendmail -t &
+ echo "$CP_NOTICE" | /usr/sbin/sendmail -t -oi &
sleep 1
fi
}
sleep 1
fi
}
@@
-356,6
+356,7
@@
cp_mv () {
if [ -e "$old" ]; then
chown --reference "$old" "$new"
chmod --reference "$old" "$new"
if [ -e "$old" ]; then
chown --reference "$old" "$new"
chmod --reference "$old" "$new"
+ cp -pf "$old" "$old.cn-old"
fi
mv "$new" "$old"
}
fi
mv "$new" "$old"
}
@@
-378,6
+379,14
@@
cp_yes_no () {
echo -n "$prompt (y)es/(n)o: "
read answer
case "$answer" in
echo -n "$prompt (y)es/(n)o: "
read answer
case "$answer" in
+ Y*)
+ echo
+ RET=y
+ ;;
+ N*)
+ echo
+ RET=n
+ ;;
y*)
echo
RET=y
y*)
echo
RET=y
@@
-389,7
+398,7
@@
cp_yes_no () {
*)
echo
echo "Please read the message and choose y or n"
*)
echo
echo "Please read the message and choose y or n"
- cp_yes_no
+ cp_yes_no "$prompt"
;;
esac
}
;;
esac
}