diff options
| -rw-r--r-- | GeneratedPackage_html_media.mk | 2 | ||||
| -rwxr-xr-x | help3xsl/convert2html.sh | 2 | ||||
| -rwxr-xr-x | help3xsl/get_media.sh | 4 | ||||
| -rwxr-xr-x | help3xsl/xhp2html.sh | 2 | ||||
| -rwxr-xr-x | helpers/find-invalid-help-images.sh | 8 |
5 files changed, 9 insertions, 9 deletions
diff --git a/GeneratedPackage_html_media.mk b/GeneratedPackage_html_media.mk index 9e483738a2..423e6a2df9 100644 --- a/GeneratedPackage_html_media.mk +++ b/GeneratedPackage_html_media.mk @@ -9,7 +9,7 @@ # $(eval $(call gb_GeneratedPackage_GeneratedPackage,helpcontent2_html_media,$(SRCDIR))) -$(eval $(call gb_GeneratedPackage_add_dir,helpcontent2_html_media,$(INSTROOT)/$(LIBO_SHARE_HELP_FOLDER)$(if $(HELP_ONLINE),/$(PRODUCTVERSION))/media/icon-themes,icon-themes/galaxy)) +$(eval $(call gb_GeneratedPackage_add_dir,helpcontent2_html_media,$(INSTROOT)/$(LIBO_SHARE_HELP_FOLDER)$(if $(HELP_ONLINE),/$(PRODUCTVERSION))/media/icon-themes,icon-themes/colibre)) $(eval $(call gb_GeneratedPackage_add_dir,helpcontent2_html_media,$(INSTROOT)/$(LIBO_SHARE_HELP_FOLDER)$(if $(HELP_ONLINE),/$(PRODUCTVERSION))/media/helpimg,helpcontent2/source/media/helpimg)) $(eval $(call gb_GeneratedPackage_add_dir,helpcontent2_html_media,$(INSTROOT)/$(LIBO_SHARE_HELP_FOLDER)$(if $(HELP_ONLINE),/$(PRODUCTVERSION))/media/navigation,helpcontent2/source/media/navigation)) diff --git a/help3xsl/convert2html.sh b/help3xsl/convert2html.sh index 3cfe860d91..f48f1d8a8e 100755 --- a/help3xsl/convert2html.sh +++ b/help3xsl/convert2html.sh @@ -287,7 +287,7 @@ echo '</sitemapindex>'>>$sitemap cp normalize.css default.css help.js fuse.js paginathing.js $outDir cp -r $enSource/source/media $outDir mkdir -p $outDir/media/icon-themes -#cp -a ../../icon-themes/galaxy/* $outDir/media/icon-themes/ +#cp -a ../../icon-themes/colibre/* $outDir/media/icon-themes/ #ln -s $productversion html/latest exit diff --git a/help3xsl/get_media.sh b/help3xsl/get_media.sh index eaaeb44f16..ac1e90fc5e 100755 --- a/help3xsl/get_media.sh +++ b/help3xsl/get_media.sh @@ -39,5 +39,5 @@ cp default.css $outDir'/'$productVersion'/' cp -a ../source/media $outDir'/'$productVersion'/' -galaxy=$(realpath $workDir'/../icon-themes/galaxy') -cp -a $galaxy $outDir'/'$productVersion'/media/icon-themes' +colibre=$(realpath $workDir'/../icon-themes/colibre') +cp -a $colibre $outDir'/'$productVersion'/media/icon-themes' diff --git a/help3xsl/xhp2html.sh b/help3xsl/xhp2html.sh index 6da95dbd95..f65f58a074 100755 --- a/help3xsl/xhp2html.sh +++ b/help3xsl/xhp2html.sh @@ -181,7 +181,7 @@ cp default.css $here'/html/'$productversion'/' cp -a ../source/media $here'/html/'$productversion'/' mkdir -p $here'/html/'$productversion'/media/icon-themes' -cp -a ../../icon-themes/galaxy/* $here'/html/'$productversion'/media/icon-themes/' +cp -a ../../icon-themes/colibre/* $here'/html/'$productversion'/media/icon-themes/' ln -s $productversion html/latest # Set helpex utility and environment diff --git a/helpers/find-invalid-help-images.sh b/helpers/find-invalid-help-images.sh index c73d40ed28..d779f80b84 100755 --- a/helpers/find-invalid-help-images.sh +++ b/helpers/find-invalid-help-images.sh @@ -6,7 +6,7 @@ # file, You can obtain one at http://mozilla.org/MPL/2.0/. # This script looks up <image ...> tags in helpcontent, checks whether the -# referenced file exist in the galaxy theme or in source/ and prints a warning if it does not. +# referenced file exist in the colibre theme or in source/ and prints a warning if it does not. # Execute from the root directory of the helpcontent2 repository. # No parameters are used. @@ -22,11 +22,11 @@ while read nextline ; do img3=${img2%%\"*}; # Check the images existence - if [ ! -f "../icon-themes/galaxy/$img3" ] ; then - # Not present in galaxy, but it may be under source/ + if [ ! -f "../icon-themes/colibre/$img3" ] ; then + # Not present in colibre, but it may be under source/ if [ ! -f "source/$img3" ] ; then # Not even there, we have an error! - echo "$img3 included in file $sourcefile is not found in the galaxy theme or the help media!"; + echo "$img3 included in file $sourcefile is not found in the colibre theme or the help media!"; fi fi done <<< "$images" |