diff options
| author | Vladimir Glazounov <vg@openoffice.org> | 2007-12-07 14:59:34 +0000 |
|---|---|---|
| committer | Vladimir Glazounov <vg@openoffice.org> | 2007-12-07 14:59:34 +0000 |
| commit | 959f26ca9da0ab254a45418b270dc7bc24bb4a75 (patch) | |
| tree | 56bd58d87c010a66b731bce3f281697086add2c6 | |
| parent | 7371518a3f834e444c425400188dcdc1f3167488 (diff) | |
#i84162#
| -rw-r--r-- | scp2/source/ooo/scpaction_ooo.scp | 20 | ||||
| -rw-r--r-- | solenv/bin/modules/installer/simplepackage.pm | 10 |
2 files changed, 23 insertions, 7 deletions
diff --git a/scp2/source/ooo/scpaction_ooo.scp b/scp2/source/ooo/scpaction_ooo.scp index 94842e3ee3ac..5c1cc4109788 100644 --- a/scp2/source/ooo/scpaction_ooo.scp +++ b/scp2/source/ooo/scpaction_ooo.scp @@ -4,9 +4,9 @@ * * $RCSfile: scpaction_ooo.scp,v $ * - * $Revision: 1.9 $ + * $Revision: 1.10 $ * - * last change: $Author: ihi $ $Date: 2007-11-26 13:27:14 $ + * last change: $Author: vg $ $Date: 2007-12-07 15:58:27 $ * * The Contents of this file are made available subject to * the terms of GNU Lesser General Public License Version 2.1. @@ -330,3 +330,19 @@ ScpAction scp_Copy_Update_Script End #endif +#ifdef MACOSX +ScpAction scp_Copy_Dmg_Background_Image + Copy = "osxdndinstall.png"; + Name = "background.png"; + UnixRights = 444; + Styles = (); + Subdir = ".background"; +End + +ScpAction scp_Copy_Ds_Store + Copy = "DS_Store"; + Name = ".DS_Store"; + UnixRights = 444; + Styles = (); +End +#endif diff --git a/solenv/bin/modules/installer/simplepackage.pm b/solenv/bin/modules/installer/simplepackage.pm index 54e6d817d996..2b5145314f51 100644 --- a/solenv/bin/modules/installer/simplepackage.pm +++ b/solenv/bin/modules/installer/simplepackage.pm @@ -4,9 +4,9 @@ # # $RCSfile: simplepackage.pm,v $ # -# $Revision: 1.8 $ +# $Revision: 1.9 $ # -# last change: $Author: ihi $ $Date: 2007-11-26 13:16:22 $ +# last change: $Author: vg $ $Date: 2007-12-07 15:59:34 $ # # The Contents of this file are made available subject to # the terms of GNU Lesser General Public License Version 2.1. @@ -330,7 +330,7 @@ sub create_simple_package # special unix rights "555" on cygwin if (( $^O =~ /cygwin/i ) && ( $ENV{'USE_SHELL'} ne "4nt" ) && ( $unixrights =~ /444/ )) { $unixrights = "555"; } - my $localcall = "$installer::globals::wrapcmd chmod $unixrights $destination \>\/dev\/null 2\>\&1"; + my $localcall = "$installer::globals::wrapcmd chmod $unixrights \'$destination\' \>\/dev\/null 2\>\&1"; system($localcall); } } @@ -348,7 +348,7 @@ sub create_simple_package $destination = $subfolderdir . $installer::globals::separator . $destination; my $destinationfile = $onelink->{'destinationfile'}; - my $localcall = "ln -sf $destinationfile $destination \>\/dev\/null 2\>\&1"; + my $localcall = "ln -sf \'$destinationfile\' \'$destination\' \>\/dev\/null 2\>\&1"; system($localcall); $infoline = "Creating link: \"ln -sf $destinationfile $destination\"\n"; @@ -361,7 +361,7 @@ sub create_simple_package my $target = $onelink->{'Target'}; my $destination = $subfolderdir . $installer::globals::separator . $onelink->{'destination'}; - my $localcall = "ln -sf $target $destination \>\/dev\/null 2\>\&1"; + my $localcall = "ln -sf \'$target\' \'$destination\' \>\/dev\/null 2\>\&1"; system($localcall); $infoline = "Creating Unix link: \"ln -sf $target $destination\"\n"; |