r12632 - packages/trunk/playonlinux/debian/patches

[Bertrand Marc]

Author: bbk-guest
Date: 2011-08-21 17:38:24 +0000 (Sun, 21 Aug 2011)
New Revision: 12632

Modified:
   packages/trunk/playonlinux/debian/patches/mscorefonts.diff
Log:
Refresh patches/mscorefonts.diff

Modified: packages/trunk/playonlinux/debian/patches/mscorefonts.diff
===================================================================
--- packages/trunk/playonlinux/debian/patches/mscorefonts.diff	2011-08-21 17:20:58 UTC (rev 12631)
+++ packages/trunk/playonlinux/debian/patches/mscorefonts.diff	2011-08-21 17:38:24 UTC (rev 12632)
@@ -6,7 +6,7 @@
  
 +fonts_install () # Debian tweak to avoid downloading Microsoft Fonts
 +{
-+	if [ ! -e "$REPERTOIRE/configurations/msfonts_installed" ] && [ ! -e "$HOME/.PlayOnLinux/configurations/msfonts_deb_installed" ]
++	if [ ! -e "$REPERTOIRE/configurations/msfonts_installed" ] && [ ! -e "$REPERTOIRE/configurations/msfonts_deb_installed" ]
 +	then
 +		FONTS_WARNING="Microsoft fonts aren't installed.\n\n\
 + If you encounter any fonts trouble, you should think about installing\
@@ -18,7 +18,7 @@
  
  install_fonts () # Install Microsoft Fonts
  {
-@@ -276,7 +287,7 @@
+@@ -276,8 +287,8 @@
  POL_SetupWindow_free_presentation "$(eval_gettext '$APPLICATION_TITLE first use')" "$(eval_gettext 'It appears it is the first time you are using $APPLICATION_TITLE.')\n$(eval_gettext 'This wizard will help you prepare $APPLICATION_TITLE environement')\n$(eval_gettext "Please ensure you are connected to the internet.")"
  
  [ "$POL_OS" == "Mac" ] && [ ! -e "/Applications/Utilities/XQuartz.app" ] && [ "$OSX_VERSION" = "10" ] &&  install_x11
@@ -27,26 +27,28 @@
  install_prefix
  POL_SetupWindow_message "$(eval_gettext 'Thank you for using $APPLICATION_TITLE')" "$(eval_gettext '$APPLICATION_TITLE first use')"
  POL_SetupWindow_Close
+-$(POL_Config_Write FIRST_USE TRUE)
+\ No newline at end of file
++$(POL_Config_Write FIRST_USE TRUE)
 --- a/bash/startup
 +++ b/bash/startup
-@@ -22,6 +22,39 @@
+@@ -22,6 +22,38 @@
  [ "$PLAYONLINUX" = "" ] && exit 0
  source "$PLAYONLINUX/lib/sources" 
  
 +install_debfonts () # Debian tweak to avoid downloading Microsoft Fonts
 +{
-+	if [ ! -e "$HOME/.PlayOnLinux/configurations/msfonts_installed" ]
-+	if [ ! -e "$REPERTOIRE/configurations/msfonts_installed" ] && [ ! -e "$HOME/.PlayOnLinux/configurations/msfonts_deb_installed" ]
++	if [ ! -e "$REPERTOIRE/configurations/msfonts_installed" ] && [ ! -e "$REPERTOIRE/configurations/msfonts_deb_installed" ]
 +	then
 +		DEBFONTS="/usr/share/fonts/truetype/msttcorefonts"
-+		if [ -e "$HOME/.PlayOnLinux/configurations/msfonts_deb_installed" ] && [ ! -d $DEBFONTS ]
++		if [ ! -d $DEBFONTS ]
 +		then
 +			rm $HOME/.PlayOnLinux/fonts/ -r 2> /dev/null
 +			rm $HOME/.PlayOnLinux/fonts 2> /dev/null
 +			rm $HOME/.PlayOnLinux/configurations/fonts_installed 2> /dev/null
 +			rm $HOME/.PlayOnLinux/configurations/msfonts_deb_installed 2> /dev/null
 +		fi
-+		if [ ! -e "$HOME/.PlayOnLinux/configurations/msfonts_deb_installed" ] && [ -d $DEBFONTS ]
++		if [ -d $DEBFONTS ]
 +		then
 +			rm $HOME/.PlayOnLinux/fonts/ -r 2> /dev/null
 +			rm $HOME/.PlayOnLinux/fonts 2> /dev/null
@@ -69,7 +71,7 @@
  # POL / POM won't work without that 
  construire_repertoire_personnel
  # Initialize link between python and bash
-@@ -43,5 +76,6 @@
+@@ -43,5 +75,6 @@
  	fi
  fi