diff options
| author | Thomas Klausner <wiz@NetBSD.org> | 2018-06-25 23:42:44 +0200 |
|---|---|---|
| committer | Thomas Klausner <tk@giga.or.at> | 2018-06-25 23:45:41 +0200 |
| commit | 8db53bfd74e48f60e3002b2ae5f7f13c9387725a (patch) | |
| tree | ed20a132c22c8d0faa54b69b0badbecbccbe7957 /desktop | |
| parent | a777e447a7d78cd91aca09b373f36c057e8bd8e0 (diff) | |
Fix "javaPathHelper: not found" errors during startup.
javaPathHelper is a tool from OpenBSD ports, so there is no point
looking for it on other operating systems.
Change-Id: I763d717fdf7172b412d527fcd88347b2e54a8fe9
Diffstat (limited to 'desktop')
| -rwxr-xr-x | desktop/scripts/soffice.sh | 7 | ||||
| -rwxr-xr-x | desktop/scripts/unopkg.sh | 6 |
2 files changed, 11 insertions, 2 deletions
diff --git a/desktop/scripts/soffice.sh b/desktop/scripts/soffice.sh index 5c76b6e2211d..df295cb76250 100755 --- a/desktop/scripts/soffice.sh +++ b/desktop/scripts/soffice.sh @@ -141,7 +141,7 @@ if echo "$checks" | grep -q "cc" ; then fi case "$(uname -s)" in -NetBSD|OpenBSD|DragonFly) +OpenBSD) # this is a temporary hack until we can live with the default search paths LD_LIBRARY_PATH="$sd_prog${LD_LIBRARY_PATH:+:$LD_LIBRARY_PATH}" JAVA_HOME=$(javaPathHelper -h libreoffice-java 2> /dev/null) @@ -150,6 +150,11 @@ NetBSD|OpenBSD|DragonFly) export JAVA_HOME fi ;; +NetBSD|DragonFly) +# this is a temporary hack until we can live with the default search paths + LD_LIBRARY_PATH="$sd_prog${LD_LIBRARY_PATH:+:$LD_LIBRARY_PATH}" + export LD_LIBRARY_PATH + ;; AIX) LIBPATH="$sd_prog${LIBPATH:+:$LIBPATH}" export LIBPATH diff --git a/desktop/scripts/unopkg.sh b/desktop/scripts/unopkg.sh index 83068d29d35e..3adf69c2e56e 100755 --- a/desktop/scripts/unopkg.sh +++ b/desktop/scripts/unopkg.sh @@ -37,7 +37,7 @@ cd "$sd_cwd" || exit $? # this is a temporary hack until we can live with the default search paths case "$(uname -s)" in -NetBSD|OpenBSD|FreeBSD|DragonFly) +OpenBSD) LD_LIBRARY_PATH="$sd_prog${LD_LIBRARY_PATH:+:${LD_LIBRARY_PATH}}" JAVA_HOME=$(javaPathHelper -h libreoffice-java 2> /dev/null) export LD_LIBRARY_PATH @@ -45,6 +45,10 @@ NetBSD|OpenBSD|FreeBSD|DragonFly) export JAVA_HOME fi ;; +NetBSD|FreeBSD|DragonFly) + LD_LIBRARY_PATH="$sd_prog${LD_LIBRARY_PATH:+:${LD_LIBRARY_PATH}}" + export LD_LIBRARY_PATH + ;; AIX) LIBPATH="$sd_prog${LIBPATH:+:${LIBPATH}}" export LIBPATH |