clavarium 0.1.0-next.1 → 0.1.0-next.2

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.
package/deploy/install.sh CHANGED
@@ -189,10 +189,16 @@ PLAN
189
189
  fi
190
190
 
191
191
  [ "$(id -u)" -eq 0 ] || refuse "run it as root (sudo)"
192
+ # /etc/os-release is read in a subshell: it defines VERSION, NAME and more, which
193
+ # would overwrite this script's own (VERSION is the Clavarium version asked for).
192
194
  # shellcheck disable=SC1091
193
- . /etc/os-release
194
- [ "${ID:-}" = "ubuntu" ] || refuse "this is ${PRETTY_NAME:-not Ubuntu}; Clavarium installs on Ubuntu Server $SUPPORTED"
195
- case " $SUPPORTED " in *" ${VERSION_ID:-} "*) : ;; *) refuse "this is Ubuntu ${VERSION_ID:-?}; supported: $SUPPORTED" ;; esac
195
+ OS_ID="$(. /etc/os-release 2>/dev/null; printf '%s' "${ID:-}")"
196
+ # shellcheck disable=SC1091
197
+ OS_VERSION_ID="$(. /etc/os-release 2>/dev/null; printf '%s' "${VERSION_ID:-}")"
198
+ # shellcheck disable=SC1091
199
+ OS_PRETTY="$(. /etc/os-release 2>/dev/null; printf '%s' "${PRETTY_NAME:-}")"
200
+ [ "$OS_ID" = "ubuntu" ] || refuse "this is ${OS_PRETTY:-not Ubuntu}; Clavarium installs on Ubuntu Server $SUPPORTED"
201
+ case " $SUPPORTED " in *" ${OS_VERSION_ID} "*) : ;; *) refuse "this is Ubuntu ${OS_VERSION_ID:-?}; supported: $SUPPORTED" ;; esac
196
202
  [ "$(uname -m)" = "x86_64" ] || refuse "this machine is $(uname -m); only x86_64 is supported"
197
203
  grep -Eq '(vmx|svm)' /proc/cpuinfo || echo "install: WARNING: this processor does not show virtualisation: VMs may not start." >&2
198
204
 
@@ -1,12 +1,12 @@
1
1
  {
2
2
  "name": "clavarium",
3
- "version": "0.1.0-next.1",
3
+ "version": "0.1.0-next.2",
4
4
  "lockfileVersion": 3,
5
5
  "requires": true,
6
6
  "packages": {
7
7
  "": {
8
8
  "name": "clavarium",
9
- "version": "0.1.0-next.1",
9
+ "version": "0.1.0-next.2",
10
10
  "license": "MIT",
11
11
  "dependencies": {
12
12
  "@xterm/addon-fit": "^0.11.0",
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "clavarium",
3
- "version": "0.1.0-next.1",
3
+ "version": "0.1.0-next.2",
4
4
  "license": "MIT",
5
5
  "type": "module",
6
6
  "description": "A conversation is a VM with a terminal in it. Everything else is a folder.",