diff options
| author | Dennis Camera <dennis.camera@ssrq-sds-fds.ch> | 2021-03-21 17:41:53 +0100 |
|---|---|---|
| committer | Dennis Camera <dennis.camera@ssrq-sds-fds.ch> | 2021-03-21 17:41:53 +0100 |
| commit | 6e342aae9e6988e790e955c665be4245b895bb4e (patch) | |
| tree | e77776ff6fd4e7a7c2b9050efe1b270b34147547 /type | |
| parent | e7a4f491876631382fdd2d92723792e869527c29 (diff) | |
| download | __dtnrch_egov-6e342aae9e6988e790e955c665be4245b895bb4e.tar.gz __dtnrch_egov-6e342aae9e6988e790e955c665be4245b895bb4e.zip | |
[type/__dtnrch_etax_sgnp] Fixes for install_dirs with spaces
Diffstat (limited to 'type')
| -rwxr-xr-x | type/__dtnrch_etax_sgnp/manifest | 17 |
1 files changed, 8 insertions, 9 deletions
diff --git a/type/__dtnrch_etax_sgnp/manifest b/type/__dtnrch_etax_sgnp/manifest index 0322929..0aff839 100755 --- a/type/__dtnrch_etax_sgnp/manifest +++ b/type/__dtnrch_etax_sgnp/manifest @@ -79,10 +79,12 @@ case ${os} in (debian|devuan|ubuntu) download_dir="/var/cache/cdist/${__type##*/}" + bundled_java_path="jre" is_freedesktop=true ;; (macosx) download_dir="/var/tmp/cdist/${__type##*/}" + bundled_java_path=".install4j/jre.bundle" is_freedesktop=false ;; (*) @@ -151,7 +153,7 @@ then version_ge "${jvm_ver:-0}" "${java_min_ver}" || { printf 'No JVM found matching minimum requirement (%s). Found only %s.\n' \ - "${java_min_ver}" "${jvm_ver:-none}" >&2 + "${java_min_ver}" "${jvm_ver:-(none)}" >&2 exit 1 } @@ -185,9 +187,10 @@ __dtnrch_install4j "${i4j_object_name}" \ --install-dir "${install_dir}" \ --installer "${remote_file}" "$@" -if ${set_jre_symlink:-false} +if ${set_jre_symlink:-false} && ! expr "${install_dir}" : '.* ' >/dev/null then - require="__dtnrch_install4j${install_dir}" \ + # FIXME: Fails if install dir contains spaces + require="__dtnrch_install4j${i4j_object_name}" \ __file "${install_dir:?}/.install4j/pref_jre.cfg" \ --state "${state_should}" \ --owner 0 --group 0 --mode 0644 \ @@ -195,15 +198,11 @@ then ${jvm_path:?} EOF - # __link "${install_dir:?}/jre" \ - # --state "${state_should}" \ - # --type symbolic \ - # --source "${jvm_path:?}" require="__file${install_dir:?}/.install4j/pref_jre.cfg" \ - __directory "${install_dir:?}/jre" --state absent + __directory "${install_dir:?}/${bundled_java_path}" --state absent fi -export require="__dtnrch_install4j${install_dir}" +export require="__dtnrch_install4j${i4j_object_name}" ################################################################################ |