[PATCH] Correct symlink in order to be used in SDK and testtool, in order to recognize the application installation path; only for Linux and similar platforms.

Giuseppe Castagno giuseppe.castagno at acca-esse.eu
Fri Oct 15 02:22:59 PDT 2010


---
 desktop/scripts/soffice.sh         |    2 +-
 sysui/desktop/share/create_tree.sh |    2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/desktop/scripts/soffice.sh b/desktop/scripts/soffice.sh
index 00c2b5c..5da4b9a 100644
--- a/desktop/scripts/soffice.sh
+++ b/desktop/scripts/soffice.sh
@@ -60,7 +60,7 @@ if [ -e ooenv ] ; then
     . ./ooenv
 fi
 
-sd_binary=`basename "$0"`.bin
+sd_binary=`basename "$0" | sed 's/libreoffice/soffice/g'`.bin 
 
 #collect all bootstrap variables specified on the command line
 #so that they can be passed as arguments to javaldx later on
diff --git a/sysui/desktop/share/create_tree.sh b/sysui/desktop/share/create_tree.sh
index 1ed7da9..d81abf5 100644
--- a/sysui/desktop/share/create_tree.sh
+++ b/sysui/desktop/share/create_tree.sh
@@ -98,7 +98,7 @@ cp openoffice.sh ${DESTDIR}/usr/bin/${PREFIX}
 cp printeradmin.sh ${DESTDIR}/usr/bin/${PREFIX}-printeradmin
 chmod 0755 ${DESTDIR}/usr/bin/${PREFIX} ${DESTDIR}/usr/bin/${PREFIX}-printeradmin
 
-ln -sf /usr/bin/${PREFIX} ${DESTDIR}/usr/bin/libreoffice
+ln -sf ${office_root}/program/soffice ${DESTDIR}/usr/bin/libreoffice
 ln -sf /usr/bin/${PREFIX}-printeradmin ${DESTDIR}/usr/bin/libreoffice-printeradmin
 
 mkdir -p ${DESTDIR}/usr/share/mime/packages
-- 
1.6.3.3


--------------030203000902040300080603
Content-Type: text/x-patch;
 name="0002-Changed-symlink-processing-to-new-application-name.patch"
Content-Transfer-Encoding: 7bit
Content-Disposition: inline;
 filename*0="0002-Changed-symlink-processing-to-new-application-name.patc";
 filename*1="h"



More information about the LibreOffice mailing list