remove nodejs from .tool-versions and simplify grep regex

archethic-foundation · Nov 5, 2022 · 1551240 · 1551240
1 parent 13bb6c5
commit 1551240
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 5 deletions.
diff --git a/.tool-versions b/.tool-versions
@@ -1,3 +1,2 @@
 elixir 1.14.1-otp-24
 erlang 24.3.4.6
-nodejs 16.18.0
diff --git a/scripts/install.sh b/scripts/install.sh
@@ -75,8 +75,8 @@ cd $SCRIPT_DIR/..
 
 asdf install
 
-ELIXIR_VERSION=$(asdf current elixir 2>&1 | grep -o '\S*' | sed -n 2p)
-ERLANG_VERSION=$(asdf current erlang 2>&1 | grep -o '\S*' | sed -n 2p)
+ELIXIR_VERSION=$(asdf current elixir 2>&1 | grep -oP '\d\S+')
+ERLANG_VERSION=$(asdf current erlang 2>&1 | grep -oP '\d\S+')
 
 asdf global elixir $ELIXIR_VERSION
 asdf global erlang $ERLANG_VERSION

diff --git a/scripts/release.sh b/scripts/release.sh
@@ -50,8 +50,8 @@ then
 
   asdf install
 
-  ELIXIR_VERSION=$(asdf current elixir 2>&1 | grep -o '\S*' | sed -n 2p)
-  ERLANG_VERSION=$(asdf current erlang 2>&1 | grep -o '\S*' | sed -n 2p)
+  ELIXIR_VERSION=$(asdf current elixir 2>&1 | grep -oP '\d\S+')
+  ERLANG_VERSION=$(asdf current erlang 2>&1 | grep -oP '\d\S+')
 
   asdf global elixir $ELIXIR_VERSION
   asdf global erlang $ERLANG_VERSION