soffice.sh (fce70c9b) soffice.sh (910823ae)
1#!/bin/sh
2#**************************************************************
3#
4# Licensed to the Apache Software Foundation (ASF) under one
5# or more contributor license agreements. See the NOTICE file
6# distributed with this work for additional information
7# regarding copyright ownership. The ASF licenses this file
8# to you under the Apache License, Version 2.0 (the

--- 67 unchanged lines hidden (view full) ---

76 break;
77 ;;
78 -writer)
79 sd_pagein_args="${sd_pagein_args} @pagein-writer"
80 break;
81 ;;
82 esac
83done
1#!/bin/sh
2#**************************************************************
3#
4# Licensed to the Apache Software Foundation (ASF) under one
5# or more contributor license agreements. See the NOTICE file
6# distributed with this work for additional information
7# regarding copyright ownership. The ASF licenses this file
8# to you under the Apache License, Version 2.0 (the

--- 67 unchanged lines hidden (view full) ---

76 break;
77 ;;
78 -writer)
79 sd_pagein_args="${sd_pagein_args} @pagein-writer"
80 break;
81 ;;
82 esac
83done
84"$sd_prog/../basis-link/program/pagein" -L"$sd_prog/../basis-link/program" \
84"$sd_prog/pagein" -L"$sd_prog" \
85 ${sd_pagein_args}
86
87# extend the ld_library_path for java: javaldx checks the sofficerc for us
85 ${sd_pagein_args}
86
87# extend the ld_library_path for java: javaldx checks the sofficerc for us
88if [ -x "$sd_prog/../basis-link/ure-link/bin/javaldx" ] ; then
88if [ -x "$sd_prog/javaldx" ] ; then
89 # this is a temporary hack until we can live with the default search paths
90 case "`uname -s`" in
91 FreeBSD)
89 # this is a temporary hack until we can live with the default search paths
90 case "`uname -s`" in
91 FreeBSD)
92 sd_prog1="$sd_prog/../basis-link/program"
93 sd_prog2="$sd_prog/../basis-link/ure-link/lib"
94 LD_LIBRARY_PATH=$sd_prog1:$sd_prog2${LD_LIBRARY_PATH+:${LD_LIBRARY_PATH}}
92 sd_prog1="$sd_prog"
93 LD_LIBRARY_PATH=$sd_prog1:${LD_LIBRARY_PATH}}
95 export LD_LIBRARY_PATH
96 ;;
97 esac
94 export LD_LIBRARY_PATH
95 ;;
96 esac
98 my_path=`"$sd_prog/../basis-link/ure-link/bin/javaldx" $BOOTSTRAPVARS \
97 my_path=`"$sd_prog/javaldx" $BOOTSTRAPVARS \
99 "-env:INIFILENAME=vnd.sun.star.pathname:$sd_prog/redirectrc"`
100 if [ -n "$my_path" ] ; then
101 LD_LIBRARY_PATH=$my_path${LD_LIBRARY_PATH:+:$LD_LIBRARY_PATH}
102 export LD_LIBRARY_PATH
103 fi
104fi
105
106unset XENVIRONMENT

--- 31 unchanged lines hidden --- 		98 "-env:INIFILENAME=vnd.sun.star.pathname:$sd_prog/redirectrc"`
99 if [ -n "$my_path" ] ; then
100 LD_LIBRARY_PATH=$my_path${LD_LIBRARY_PATH:+:$LD_LIBRARY_PATH}
101 export LD_LIBRARY_PATH
102 fi
103fi
104
105unset XENVIRONMENT

--- 31 unchanged lines hidden ---