fix icon placement in dmg and tweak docs and filenames

4 files changed, 25 insertions, 36 deletions

diff --git a/ports/darwin_dmg/HOW_TO_INSTALL.txt b/ports/darwin_dmg/HOW_TO_INSTALL.txt
index fb0ae32..260eb1b 100644
--- a/ports/darwin_dmg/HOW_TO_INSTALL.txt
+++ b/ports/darwin_dmg/HOW_TO_INSTALL.txt
@@ -1,21 +1,17 @@
-1. Drag the Rakudo folder onto the Applications folder.
-2. In a Terminal window, type this command:
-    alias p6='/Applications/Rakudo/bin/perl6'
-        ( This step only affects this one window; to make available to all
-          future sessions, add the line to your ~/.bash_profile file. )
-
-You can now run a Perl 6 program like this:
-    p6 filename
-or run code directly from the command-line with the -e option:
-    p6 -e 'your code here'
-
-Try this:
-    p6 -e 'say "Hello, world!";'
-
-You can always skip the alias and use the full path:
-    /Applications/Rakudo/bin/perl6 -e 'say "Hello, world!";'
-or alternately, add Rakudo Star to your path:
-    PATH=$PATH:/Applications/Rakudo/bin
-    perl6 -e 'say "Hello, world!";'
-
-See also README in /Applications/Rakudo/docs/rakudo/README .
+1. Drag the 'Rakudo' folder onto the Applications folder.
+
+2. Drag the 'Docs' folder somewhere.
+
+3. In a Terminal window add Rakudo Star to your path:
+
+   export PATH=$PATH:/Applications/Rakudo/bin:/Applications/Rakudo/share/perl6/site/bin
+
+   Test with:
+
+   perl6 -e 'say "Hello, world!";'
+
+4. Add the 'export' line above to .bash_profile or similar to persist.
+
+5. Useful commands are 'p6doc' and 'panda'.
+
+6. See also the documents in the 'Docs' folder and http://perl6.org
diff --git a/ports/darwin_dmg/README b/ports/darwin_dmg/README
index 70d7d5a..02f6991 100644
--- a/ports/darwin_dmg/README
+++ b/ports/darwin_dmg/README
@@ -1,16 +1,8 @@
 This directory contains the Perl script and supporting files to:
-* Compile Parrot and Rakudo in a way that removes embedded dependencies on
-  the builder's home directory; such dependencies have been a problem on
-  Darwin.
+
+* Compile Rakudo Moar
+
 * Package the compiled binaries into a .dmg disk image for Mac OS X.
-  Users can open the .dmg file, then just drag the Rakudo_Star folder onto
+  Users can open the .dmg file, then just drag the Rakudo folder onto
   the /Applications folder to install.
 
-The process currently depends on first downloading the official R* tarball
-for the month, rather than being part of building the tarball itself. This
-may seem non-optimal, but it helps limit the chance of the binary varying
-too much from a end-user's source build, and it keeps the R* release
-manager from needing the same platform as the binary build person. Also,
-it is the way I designed and wrote it before realizing there might be any
-other way :)
-
diff --git a/ports/darwin_dmg/adjust_installation_window.scpt b/ports/darwin_dmg/adjust_installation_window.scpt
index bc96bc6..5c8fa1b 100644
--- a/ports/darwin_dmg/adjust_installation_window.scpt
+++ b/ports/darwin_dmg/adjust_installation_window.scpt
@@ -25,7 +25,8 @@ tell application "Finder"
 
         set position of item "Rakudo"        to {120,  74}
         set position of item "Applications"       to {360,  74}
-        set position of item "HOW_TO_INSTALL.txt" to {120, 264}
+        set position of item "README.txt" to {120, 264}
+        set position of item "docs" to {360, 264}
 
         delay 5
         close
diff --git a/ports/darwin_dmg/package_darwin_dmg.pl b/ports/darwin_dmg/package_darwin_dmg.pl
index cce2f85..4770539 100755
--- a/ports/darwin_dmg/package_darwin_dmg.pl
+++ b/ports/darwin_dmg/package_darwin_dmg.pl
@@ -129,8 +129,8 @@ run "hdiutil create  '$temp_dmg' -ov -size ${size}k -fs HFS+ -volname '$vol_name
 
 print "Copying Rakudo files\n";
 run "CpMac -r '$src_dir'    '$vol_dir'";
-run "cp ../HOW_TO_INSTALL.txt  '$vol_dir'";
-run "cp -pr ../../../docs  '$vol_dir'";
+run "cp ../HOW_TO_INSTALL.txt  '$vol_dir/README.txt'";
+run "cp -pr ../../../docs  '$vol_dir/Docs'";
 
 run "touch                        '$vol_dir/Rakudo/Icon\r'";
 run "cp ../2000px-Camelia.svg.icns $vol_dir/.VolumeIcon.icns";