diff options
| author | Shinnok <admin@shinnok.com> | 2017-11-28 18:34:21 +0200 |
|---|---|---|
| committer | Olivier Hallot <olivier.hallot@libreoffice.org> | 2017-11-29 11:50:37 +0100 |
| commit | 50ac5af18de36477bc0db81391adfd8a3a76853c (patch) | |
| tree | f282d7f029a30d50b74dfcd46e131cde8395a9d8 /help3xsl | |
| parent | db60e4b8ed439fcf103fa4937691498eee8f5e9c (diff) | |
Replace cp -rap with cp -a, satisfying all *nixes.
On macOS, probably BSD too -rap will fail with both -r and -R implied.
Change-Id: I6844d6f2ac52ca1c10564857f4e9190e1627ce52
Reviewed-on: https://gerrit.libreoffice.org/45430
Reviewed-by: Olivier Hallot <olivier.hallot@libreoffice.org>
Tested-by: Olivier Hallot <olivier.hallot@libreoffice.org>
Diffstat (limited to 'help3xsl')
| -rwxr-xr-x | help3xsl/convert2html.sh | 2 | ||||
| -rwxr-xr-x | help3xsl/get_media.sh | 4 | ||||
| -rwxr-xr-x | help3xsl/help-to-html.sh | 6 | ||||
| -rwxr-xr-x | help3xsl/xhp2html.sh | 6 |
4 files changed, 9 insertions, 9 deletions
diff --git a/help3xsl/convert2html.sh b/help3xsl/convert2html.sh index 9eafdf1832..f8a84c4349 100755 --- a/help3xsl/convert2html.sh +++ b/help3xsl/convert2html.sh @@ -287,7 +287,7 @@ echo '</sitemapindex>'>>$sitemap cp normalize.css default.css help.js jquery-3.1.1.min.js $outDir cp -r $enSource/source/media $outDir mkdir -p $outDir/media/icon-themes -#cp -rap ../../icon-themes/galaxy/* $outDir/media/icon-themes/ +#cp -a ../../icon-themes/galaxy/* $outDir/media/icon-themes/ #ln -s $productversion html/latest exit diff --git a/help3xsl/get_media.sh b/help3xsl/get_media.sh index d0b7060d3e..12f636b2b8 100755 --- a/help3xsl/get_media.sh +++ b/help3xsl/get_media.sh @@ -36,7 +36,7 @@ cp jquery-3.1.1.min.js $outDir'/'$productVersion'/' cp normalize.css $outDir'/'$productVersion'/' cp default.css $outDir'/'$productVersion'/' -cp -rap ../source/media $outDir'/'$productVersion'/' +cp -a ../source/media $outDir'/'$productVersion'/' galaxy=$(realpath $workDir'/../icon-themes/galaxy') -cp -rap $galaxy $outDir'/'$productVersion'/media/icon-themes' +cp -a $galaxy $outDir'/'$productVersion'/media/icon-themes' diff --git a/help3xsl/help-to-html.sh b/help3xsl/help-to-html.sh index 1298106ec4..1b7e6a74d4 100755 --- a/help3xsl/help-to-html.sh +++ b/help3xsl/help-to-html.sh @@ -41,9 +41,9 @@ mkdir -p html/$productversion #copy some service files cp index.html html/ cp default.css help.js jquery-3.1.1.min.js tabs.css tree.css $outDir -cp -rap ../source/media $outDir +cp -a ../source/media $outDir mkdir -p $outDir'media/icon-themes' -cp -rap ../../icon-themes/galaxy/* $outDir/media/icon-themes/ +cp -a ../../icon-themes/galaxy/* $outDir/media/icon-themes/ ln -s $productversion html/latest # Create the bookmark2file map @@ -95,5 +95,5 @@ done # Should copy core/icon-themes/galaxy/ to the media folder as icon-theme/ #mkdir $outDir'media/icon-theme' - # cp -rap ../../../../../icon-themes/galaxy/* $outDir/media/icon-theme/ + # cp -a ../../../../../icon-themes/galaxy/* $outDir/media/icon-theme/ exit diff --git a/help3xsl/xhp2html.sh b/help3xsl/xhp2html.sh index de146e387c..4b37342543 100755 --- a/help3xsl/xhp2html.sh +++ b/help3xsl/xhp2html.sh @@ -181,9 +181,9 @@ cp jquery-3.1.1.min.js $here'/html/'$productversion'/' cp normalize.css $here'/html/'$productversion'/' cp default.css $here'/html/'$productversion'/' -cp -rap ../source/media $here'/html/'$productversion'/' +cp -a ../source/media $here'/html/'$productversion'/' mkdir -p $here'/html/'$productversion'/media/icon-themes' -cp -rap ../../icon-themes/galaxy/* $here'/html/'$productversion'/media/icon-themes/' +cp -a ../../icon-themes/galaxy/* $here'/html/'$productversion'/media/icon-themes/' ln -s $productversion html/latest # Set helpex utilty and environment @@ -243,7 +243,7 @@ mkdir -p $outDirHTML if [ "$lang" == en-US ]; then -cp -rap $helpfiles $outDirLang +cp -a $helpfiles $outDirLang else # Create first all translations of xhp |