Casper

Merge lp:~timo-jyrinki/casper/examples_desktop_file into lp:casper

  1. examples_desktop_file
  2. Merge into trunk
Proposed by Timo Jyrinki
Status: Merged
Merged at revision: not available
Proposed branch: lp:~timo-jyrinki/casper/examples_desktop_file
Merge into: lp:casper
Diff against target: None lines
To merge this branch: bzr merge lp:~timo-jyrinki/casper/examples_desktop_file
Reviewer Review Type Date Requested Status
Colin Watson Approve
Review via email: mp+4578@code.launchpad.net
To post a comment you must log in.
Revision history for this message
Timo Jyrinki (timo-jyrinki) wrote :

"grep -r Examples" -> make a change. Not tested, and I don't know anything about casper... but would most probably work together with the proposed example-content change.

Revision history for this message
Colin Watson (cjwatson) wrote :

Can you please make it check for both old and new locations? This
generally makes life easier.

Revision history for this message
Daniel Holbach (dholbach) wrote :

I'm holding off on uploading example-content right now, might take until the end of the week because of the Ubuntu Free Culture Showcase.

With the change that Colin suggests this should be irrelevant though.

lp:~timo-jyrinki/casper/examples_desktop_file updated
595. By Timo Jyrinki <timo@olohuone>

Keep the check for Examples as well, and change the examples.desktop check into a regular file check instead of symbolic link.

Revision history for this message
Timo Jyrinki (timo-jyrinki) wrote :

Ok. Added the Examples check back, and additionally changed the examples.desktop check into a regular file check instead of symbolic link, as it should be.

Revision history for this message
Daniel Holbach (dholbach) wrote :

I'd like to upload the new example-content which "depends" on this change.

Revision history for this message
Colin Watson (cjwatson) :
review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'scripts/casper-bottom/10adduser'
2--- scripts/casper-bottom/10adduser 2009-02-06 15:02:11 +0000
3+++ scripts/casper-bottom/10adduser 2009-03-17 12:45:27 +0000
4@@ -63,9 +63,9 @@
5 fi
6 done
7
8-if [ -L /root/home/$USERNAME/Examples ]; then
9+if [ -L /root/home/$USERNAME/examples.desktop ]; then
10 chroot /root install -o $USERNAME -g $USERNAME -d /home/$USERNAME/Desktop/
11- mv /root/home/$USERNAME/Examples /root/home/$USERNAME/Desktop/
12+ mv /root/home/$USERNAME/examples.desktop /root/home/$USERNAME/Desktop/
13 fi
14
15 #Kubuntu

Subscribers

People subscribed via source and target branches