diff options
| author | Dennis Camera <cdist@dtnr.ch> | 2021-03-22 08:31:21 +0100 |
|---|---|---|
| committer | Dennis Camera <cdist@dtnr.ch> | 2021-03-22 08:32:05 +0100 |
| commit | b31172a2aa2172fda43171f76547bfc26f15cacb (patch) | |
| tree | 8c917ba503848d81a564eca0de6b10ff165cdead /type | |
| parent | e6f3cfbba18862a02e27bd0da2823f5ea8440808 (diff) | |
| download | __dtnrch_egov-b31172a2aa2172fda43171f76547bfc26f15cacb.tar.gz __dtnrch_egov-b31172a2aa2172fda43171f76547bfc26f15cacb.zip | |
Update man.rst
Diffstat (limited to 'type')
| -rw-r--r-- | type/__dtnrch_etax_sgnp/man.rst | 6 | ||||
| -rwxr-xr-x | type/__dtnrch_etax_sgnp/manifest | 11 | ||||
| -rw-r--r-- | type/__dtnrch_install4j/man.rst | 24 |
3 files changed, 34 insertions, 7 deletions
diff --git a/type/__dtnrch_etax_sgnp/man.rst b/type/__dtnrch_etax_sgnp/man.rst index 132e9b2..04d797c 100644 --- a/type/__dtnrch_etax_sgnp/man.rst +++ b/type/__dtnrch_etax_sgnp/man.rst @@ -8,7 +8,7 @@ cdist-type__dtnrch_etax_sgnp - Install Steuer St.Gallen natürliche Personen. DESCRIPTION ----------- -This space intentionally left blank. +Installs and patches (if needed) the SGnP application. REQUIRED PARAMETERS @@ -54,8 +54,8 @@ EXAMPLES # Install to custom location __dtnrch_etax_sgnp Steuer_St.Gallen_2020_nP \ - --version 2019 \ - --prefix /opt/taxes/SGnP/2020 + --version 2020 \ + --install-dir /opt/taxes/SGnP/2020 # Uninstall the application __dtnrch_etax_sgnp Steuer_St.Gallen_2020_nP --version 2020 --state absent diff --git a/type/__dtnrch_etax_sgnp/manifest b/type/__dtnrch_etax_sgnp/manifest index 63262e9..8993a1b 100755 --- a/type/__dtnrch_etax_sgnp/manifest +++ b/type/__dtnrch_etax_sgnp/manifest @@ -187,9 +187,16 @@ __dtnrch_install4j "${i4j_object_name}" \ --install-dir "${install_dir}" \ --installer "${remote_file}" "$@" -if ${set_jre_symlink:-false} && ! expr "${install_dir}" : '.* ' >/dev/null +if ${set_jre_symlink:-false} then # FIXME: Fails if install dir contains spaces + if expr "${install_dir}" : '.* ' >/dev/null + then + echo 'Cannot force system JVM if the installation directory contains spaces.' >&2 + # we hope that install4j will make proper links if no JRE was bundled. + test "${NO_JRE:-0}" -ne 0 || exit 1 + else + require="__dtnrch_install4j${i4j_object_name}" \ __file "${install_dir:?}/.install4j/pref_jre.cfg" \ --state "${state_should}" \ @@ -200,6 +207,8 @@ then require="__file${install_dir:?}/.install4j/pref_jre.cfg" \ __directory "${install_dir:?}/${bundled_java_path}" --state absent + + fi fi export require="__dtnrch_install4j${i4j_object_name}" diff --git a/type/__dtnrch_install4j/man.rst b/type/__dtnrch_install4j/man.rst index efddf4e..1edad1f 100644 --- a/type/__dtnrch_install4j/man.rst +++ b/type/__dtnrch_install4j/man.rst @@ -8,7 +8,10 @@ cdist-type__dtnrch_install4j - Install applications using install4j installers DESCRIPTION ----------- -This space intentionally left blank. +This type can be used to install applications using the install4j installer +framework. +It supports updating applications by replacing the file pointed to by +``--installer`` with another one. REQUIRED PARAMETERS @@ -57,8 +60,23 @@ EXAMPLES .. code-block:: sh - # TODO - __dtnrch_install4j + # Install application foo (Unix) + __dtnrch_install4j /opt/foo \ + --installer /var/tmp/foo_installer.sh + + # Install application foo (Mac) + __dtnrch_install4j /Applications/Foo_Application \ + --install-dir '/Applications/Foo Application' \ + --installer /var/tmp/foo.dmg + + # Install application bar (which doesn't have a bundled JRE) + __dtnrch_install4j /opt/bar \ + --installer /var/tmp/bar_installer.sh \ + --java-home /usr/lib/jvm/java-8-openjdk-amd64 + + # Uninstall application bar + __dtnrch_install4j /opt/bar --state absent \ + --installer /var/tmp/bar_installer.sh SEE ALSO |