diff options
| author | Miklos Vajna <vmiklos@suse.cz> | 2013-02-04 01:32:26 +0100 |
|---|---|---|
| committer | Miklos Vajna <vmiklos@suse.cz> | 2013-02-05 10:57:20 +0100 |
| commit | 117b3242dbdcf5c9690921f2f4cf1495df10c11e (patch) | |
| tree | 341671c4c70e06e01c5773ba64d80ba6442d259a | |
| parent | 9d2629a753c7cdf2a334f3f40954b1d0cc631297 (diff) | |
scp2: copy the install script to the tarball on Linux
Change-Id: I657b2ec94e6029cc14bd29611c7b0c3ce359103b
| -rwxr-xr-x | readlicense_oo/docs/readme.xrm | 1 | ||||
| -rw-r--r-- | scp2/source/ooo/scpaction_ooo.scp | 8 |
2 files changed, 9 insertions, 0 deletions
diff --git a/readlicense_oo/docs/readme.xrm b/readlicense_oo/docs/readme.xrm index 6539717436fc..5788125b79b0 100755 --- a/readlicense_oo/docs/readme.xrm +++ b/readlicense_oo/docs/readme.xrm @@ -147,6 +147,7 @@ <p id="rpminstall5" xml:lang="en-US">For Fedora-based systems: su -c 'yum install *.rpm'</p> <p id="rpminstall6" xml:lang="en-US">For Mandriva-based systems: sudo urpmi *.rpm</p> <p id="rpminstall7" xml:lang="en-US">For other RPM-based systems (Suse, etc.): rpm -Uvh *.rpm</p> + <p id="rpminstall7a" xml:lang="en-US">Alternatively, you can use the 'install' script, located in the toplevel directory of this archive to perform an installation as a user. The script will set up ${PRODUCTNAME} to have its own profile for this installation, separated from your normal ${PRODUCTNAME} profile.</p> <p id="rpminstall8" xml:lang="en-US">The above command does the first part of the installation process. To complete the process, you also need to install the desktop integration packages. To do this, change directory to the "desktop-integration" directory that is within the "RPMS" directory, using the following command:</p> <p id="rpminstall9" xml:lang="en-US">cd desktop-integration</p> <p id="rpminstallA" xml:lang="en-US">Now run the installation command again:</p> diff --git a/scp2/source/ooo/scpaction_ooo.scp b/scp2/source/ooo/scpaction_ooo.scp index 462273175237..63a1d04e53dd 100644 --- a/scp2/source/ooo/scpaction_ooo.scp +++ b/scp2/source/ooo/scpaction_ooo.scp @@ -53,6 +53,14 @@ ScpAction scp_Copy_Readme_Txt End #endif +#if !defined(WNT) && !defined(MACOSX) +ScpAction scp_Copy_Install + Copy = "userscripts/install"; + Name = "install"; + UnixRights = 755; +End +#endif + #if defined(WNT) && defined(_gcc3) #if defined(MINGW_GCCDLL) ScpAction SCP_COPY_MINGW_GCCS |