@norskvideo/ctl-dev-kit 0.2.133 → 0.2.135

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
@@ -88,6 +88,16 @@ launch_params() {
88
88
  [ "${#missing[@]}" = 0 ] || oops "export the required launch parameters: ${missing[*]}"
89
89
  }
90
90
 
91
+ # The norsk-ctl installer's licence argument, NUL-separated: an older installer
92
+ # demands --license, a current one takes none. The product's licence reaches
93
+ # `product add` regardless.
94
+ installer_licence_args() {
95
+ local installer=$1 license=$2
96
+ if grep -q -- '--license)' "${installer}"; then
97
+ printf -- '--license\0%s\0' "${license}"
98
+ fi
99
+ }
100
+
91
101
  main() {
92
102
  local here
93
103
  here="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)"
@@ -177,7 +187,9 @@ main() {
177
187
  else
178
188
  flags+=(--public-host "${PUBLIC_HOST:-auto}")
179
189
  fi
180
- bash "${installer}" --server --version "${CTL_VERSION}" --license "${license}" "${flags[@]}" --pull-images --yes
190
+ local licence_args=()
191
+ while IFS= read -r -d '' arg; do licence_args+=("${arg}"); done < <(installer_licence_args "${installer}" "${license}")
192
+ bash "${installer}" --server --version "${CTL_VERSION}" "${licence_args[@]}" "${flags[@]}" --pull-images --yes
181
193
  rm -f "${installer}"
182
194
  fi
183
195
  # The public installer leaves a running norsk-ctl as it is, so a box set up by
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@norskvideo/ctl-dev-kit",
3
- "version": "0.2.133",
3
+ "version": "0.2.135",
4
4
  "type": "module",
5
5
  "repository": {
6
6
  "type": "git",