diff --git a/deploy/single-script-install.sh b/deploy/single-script-install.sh index 03e272575..06ad6a897 100755 --- a/deploy/single-script-install.sh +++ b/deploy/single-script-install.sh @@ -70,7 +70,7 @@ then fi NODE_MAJOR=18 printf "deb [signed-by=/etc/apt/keyrings/nodesource.gpg] \ - https://deb.nodesource.com/node_$NODE_MAJOR.x nodistro main" | \ + https://deb.nodesource.com/node_%s.x nodistro main" "$NODE_MAJOR" | \ sudo tee /etc/apt/sources.list.d/nodesource.list sudo apt-get update sudo apt-get install -y nodejs diff --git a/deploy/vagrant/make_boxes/dtaas/README.md b/deploy/vagrant/make_boxes/dtaas/README.md index 18ff48450..6af170ed7 100644 --- a/deploy/vagrant/make_boxes/dtaas/README.md +++ b/deploy/vagrant/make_boxes/dtaas/README.md @@ -4,9 +4,7 @@ This README provides instructions on creating a custom Operating System virtual disk for running the DTaaS software. The virtual disk is managed by **vagrant**. The purpose is two fold: -* Provide cross-platform installation of the DTaaS application. Any operating -system supporting use of vagrant software utility can support installation of -the DTaaS software. +* Provide cross-platform installation of the DTaaS application. Any operating system supporting use of vagrant software utility can support installation of the DTaaS software. * Create a ready to use development environment for code contributors. There are two scripts in this directory: @@ -17,10 +15,10 @@ There are two scripts in this directory: | `developer.sh` | developer installation | :x: | If you are installing the DTaaS for developers, the default installation -caters to your needs. You can skip the next step and continue with the +caters to your needs. You can skip the next step and continue with the creation of vagrant box. -If you are a developer and would like additional software installed, you need +If you are a developer and would like additional software installed, you need to modify `Vagrantfile`. The existing `Vagrantfile` has two lines: ```sh @@ -44,7 +42,7 @@ This vagrant box installed for users will have the following items: * influxdb v2.7 * grafana v10.1 * rabbitmq v3-management - * eclipse-mosquitto (mqtt) v2 + * eclipse-mosquitto (mqtt) v2 This vagrant box installed for developers will have the following items additional items: diff --git a/deploy/vagrant/make_boxes/dtaas/provision.sh b/deploy/vagrant/make_boxes/dtaas/provision.sh index d880494ef..588dc6d5d 100755 --- a/deploy/vagrant/make_boxes/dtaas/provision.sh +++ b/deploy/vagrant/make_boxes/dtaas/provision.sh @@ -52,7 +52,8 @@ then gpg --dearmor -o /etc/apt/keyrings/nodesource.gpg fi NODE_MAJOR=18 -printf "deb [signed-by=/etc/apt/keyrings/nodesource.gpg] https://deb.nodesource.com/node_$NODE_MAJOR.x nodistro main" | \ +printf "deb [signed-by=/etc/apt/keyrings/nodesource.gpg] \ + https://deb.nodesource.com/node_%s.x nodistro main" "$NODE_MAJOR" | \ tee /etc/apt/sources.list.d/nodesource.list apt-get update apt-get install -y nodejs diff --git a/deploy/vagrant/make_boxes/dtaas/user.sh b/deploy/vagrant/make_boxes/dtaas/user.sh index c546ce103..4fd8203a9 100755 --- a/deploy/vagrant/make_boxes/dtaas/user.sh +++ b/deploy/vagrant/make_boxes/dtaas/user.sh @@ -46,7 +46,8 @@ then gpg --dearmor -o /etc/apt/keyrings/nodesource.gpg fi NODE_MAJOR=18 -printf "deb [signed-by=/etc/apt/keyrings/nodesource.gpg] https://deb.nodesource.com/node_$NODE_MAJOR.x nodistro main" | \ +printf "deb [signed-by=/etc/apt/keyrings/nodesource.gpg] \ + https://deb.nodesource.com/node_%s.x nodistro main" "$NODE_MAJOR" | \ tee /etc/apt/sources.list.d/nodesource.list apt-get update apt-get install -y nodejs diff --git a/docs/admin/vagrant/base-box.md b/docs/admin/vagrant/base-box.md index e7d03904b..3b15c0779 100644 --- a/docs/admin/vagrant/base-box.md +++ b/docs/admin/vagrant/base-box.md @@ -4,9 +4,7 @@ This README provides instructions on creating a custom Operating System virtual disk for running the DTaaS software. The virtual disk is managed by **vagrant**. The purpose is two fold: -* Provide cross-platform installation of the DTaaS application. Any operating -system supporting use of vagrant software utility can support installation of -the DTaaS software. +* Provide cross-platform installation of the DTaaS application. Any operating system supporting use of vagrant software utility can support installation of the DTaaS software. * Create a ready to use development environment for code contributors. There are two scripts in this directory: @@ -17,10 +15,10 @@ There are two scripts in this directory: | `developer.sh` | developer installation | :x: | If you are installing the DTaaS for developers, the default installation -caters to your needs. You can skip the next step and continue with the +caters to your needs. You can skip the next step and continue with the creation of vagrant box. -If you are a developer and would like additional software installed, you need +If you are a developer and would like additional software installed, you need to modify `Vagrantfile`. The existing `Vagrantfile` has two lines: ```sh @@ -44,7 +42,7 @@ This vagrant box installed for users will have the following items: * influxdb v2.7 * grafana v10.1 * rabbitmq v3-management - * eclipse-mosquitto (mqtt) v2 + * eclipse-mosquitto (mqtt) v2 This vagrant box installed for developers will have the following items additional items: diff --git a/script/env.sh b/script/env.sh index 41be45823..b87d453f3 100755 --- a/script/env.sh +++ b/script/env.sh @@ -68,8 +68,10 @@ then sudo gpg --dearmor -o /etc/apt/keyrings/nodesource.gpg fi NODE_MAJOR=18 -printf "deb [signed-by=/etc/apt/keyrings/nodesource.gpg] https://deb.nodesource.com/node_$NODE_MAJOR.x nodistro main" | \ +printf "deb [signed-by=/etc/apt/keyrings/nodesource.gpg] \ + https://deb.nodesource.com/node_%s.x nodistro main" "$NODE_MAJOR" | \ sudo tee /etc/apt/sources.list.d/nodesource.list + sudo apt-get update sudo apt-get install -y nodejs sudo npm install -g npm@10.2.0