[PC-BSD Commits] r5025 - pbibuild/pbi-source/PBCsource

[svn at pcbsd.org]

Author: kris
Date: 2009-11-16 10:55:28 -0800 (Mon, 16 Nov 2009)
New Revision: 5025

Modified:
   pbibuild/pbi-source/PBCsource/pbistart.c
Log:

Updated pbistart.c, will change how we detect LANG for PBIS



Modified: pbibuild/pbi-source/PBCsource/pbistart.c
===================================================================
--- pbibuild/pbi-source/PBCsource/pbistart.c	2009-11-16 17:43:11 UTC (rev 5024)
+++ pbibuild/pbi-source/PBCsource/pbistart.c	2009-11-16 18:55:28 UTC (rev 5025)
@@ -213,6 +213,13 @@
 strcat(whoamicmd, "/whoami");
 system(whoamicmd);
 
+/* Check the kde4 language before running the PBI */
+char langcmd[200];
+strcpy(langcmd, "grep ^Language= ~/.kde4/share/config/kdeglobals | cut -d '=' -f2 | cut -d ':' -f 1 >");
+strcat(langcmd, pbitmpdir);
+strcat(langcmd, "/lang");
+system(langcmd);
+
 /* Get the PBI_ARCHIVE2 Location for later on */
 strcpy(tmpfile, pbitmpdir);
 strcat(tmpfile, "/pbiskip");
@@ -326,15 +333,13 @@
 if ( textmode != 1)
 {
 
-
 char pbiscript[600];
 strcpy(pbiscript, "echo \"#!/bin/sh\n\
-. /PCBSD/LANGS/PCBSDLANG\n\
-LD_LIBRARY_PATH=/Programs/.libs7/ ; export LD_LIBRARY_PATH\n\
+LANG=`cat lang`; export LANG\n\
+LD_LIBRARY_PATH=/Programs/.libs8/ ; export LD_LIBRARY_PATH\n\
 cd ");
 strcat(pbiscript, pbitmpdir);
 
-
 // If we are running on amd64 and installing 32bit PBI, use 64-native PBI
 if( run32mode )
 {
@@ -395,8 +400,8 @@
 
 char pbiscript[600];
 strcpy(pbiscript, "echo \"#!/bin/sh\n\
-. /PCBSD/LANGS/PCBSDLANG\n\
-LD_LIBRARY_PATH=/Programs/.libs7/ ; export LD_LIBRARY_PATH\n\
+LANG=`cat lang`; export LANG\n\
+LD_LIBRARY_PATH=/Programs/.libs8/ ; export LD_LIBRARY_PATH\n\
 cd ");
 strcat(pbiscript, pbitmpdir);
 // If we are running on amd64 and installing 32bit PBI, use 64-native PBI