[ubuntu/karmic] base-files 5.0.0ubuntu3 (Accepted)

[Dustin Kirkland]

On Thu, Jul 9, 2009 at 1:09 AM, Martin Pitt<martin.pitt at ubuntu.com> wrote:
> Hello Dustin,
>
> Dustin Kirkland [2009-07-08 22:05 -0000]:
>> base-files (5.0.0ubuntu3) karmic; urgency=low
>>
>>   * etc/motd, etc/legal.sh, debian/rules, share/motd.md5sums: pursuant to
>>     consultation with Canonical's Legal Department, it is sufficient
>>     to display the warranty disclaimer only once per user; move this
>>     text out of the stock /etc/motd, and into an /etc/profile.d/legal.sh
>>     script; display the text if a certain flag is not detected and touch
>>     the flag file
>
> Thanks for doing this!
>
> +       touch "$HOME/.legal"
>
> One request, can we change this to ~/.cache/motd/legal-displayed ?
>
> ~/.legal sounds way too generic, and it really belongs into ~/.cache/.


Sure, done!


diff -Nru base-files-5.0.0ubuntu3/etc/legal.sh
base-files-5.0.0ubuntu4/etc/legal.sh
--- base-files-5.0.0ubuntu3/etc/legal.sh	2009-07-08 16:55:04.000000000 -0500
+++ base-files-5.0.0ubuntu4/etc/legal.sh	2009-07-09 14:32:39.000000000 -0500
@@ -1,6 +1,8 @@
 #!/bin/sh

-if [ ! -e "$HOME/.legal" ] && [ -r /etc/legal ]; then
+FLAG="$HOME/.cache/motd/legal-displayed"
+if [ ! -e "$FLAG" ] && [ -r /etc/legal ]; then
 	cat /etc/legal
-	touch "$HOME/.legal"
+	mkdir -p $(dirname "$FLAG")
+	touch "$FLAG"



:-Dustin