Skip to content

K
k3s
Unverified Commit 9f8fc74e authored by Erik Wilson's avatar Erik Wilson Committed by GitHub
Browse files
Options

Merge pull request #1494 from joakimr-axis/joakimr-axis_backticks

Use contemporary $() instead of legacy `` in shell commands
parents eb96a437 3857733b
Hide whitespace changes
Inline Side-by-side
Showing with 5 additions and 5 deletions
Makefile
View file @ 9f8fc74e
...@@ -2,7 +2,7 @@ TARGETS := $(shell ls scripts | grep -v \\.sh) ...@@ -2,7 +2,7 @@ TARGETS := $(shell ls scripts | grep -v \\.sh)
.dapper: .dapper:
@echo Downloading dapper @echo Downloading dapper
@curl -sL https://releases.rancher.com/dapper/v0.4.2/dapper-`uname -s`-`uname -m` > .dapper.tmp @curl -sL https://releases.rancher.com/dapper/v0.4.2/dapper-$(uname -s)-$(uname -m) > .dapper.tmp
@@chmod +x .dapper.tmp @@chmod +x .dapper.tmp
@./.dapper.tmp -v @./.dapper.tmp -v
@mv .dapper.tmp .dapper @mv .dapper.tmp .dapper
......
tests/perf/scripts/test
View file @ 9f8fc74e
...@@ -3,8 +3,8 @@ ...@@ -3,8 +3,8 @@
test_load() { test_load() {
source scripts/config source scripts/config
eval PRIVATE_KEY_PATH=$PRIVATE_KEY_PATH eval PRIVATE_KEY_PATH=$PRIVATE_KEY_PATH
EXPANDED_PRIV_KEY_PATH=`readlink -f $PRIVATE_KEY_PATH` EXPANDED_PRIV_KEY_PATH=$(readlink -f $PRIVATE_KEY_PATH)
masterips=`terraform output -state=server/server.tfstate | grep k3s_server_ips | cut -d "=" -f 2` masterips=$(terraform output -state=server/server.tfstate | grep k3s_server_ips | cut -d "=" -f 2)
pushd tests/ pushd tests/
docker run -v $EXPANDED_PRIV_KEY_PATH:/opt/priv_key \ docker run -v $EXPANDED_PRIV_KEY_PATH:/opt/priv_key \
-e KUBE_SSH_USER=ubuntu \ -e KUBE_SSH_USER=ubuntu \
...@@ -23,8 +23,8 @@ test_load() { ...@@ -23,8 +23,8 @@ test_load() {
test_density() { test_density() {
source scripts/config source scripts/config
eval PRIVATE_KEY_PATH=$PRIVATE_KEY_PATH eval PRIVATE_KEY_PATH=$PRIVATE_KEY_PATH
EXPANDED_PRIV_KEY_PATH=`readlink -f $PRIVATE_KEY_PATH` EXPANDED_PRIV_KEY_PATH=$(readlink -f $PRIVATE_KEY_PATH)
masterips=`terraform output -state=server/server.tfstate | grep k3s_server_ips | cut -d "=" -f 2` masterips=$(terraform output -state=server/server.tfstate | grep k3s_server_ips | cut -d "=" -f 2)
pushd tests/ pushd tests/
docker run -e KUBE_SSH_USER=ubuntu \ docker run -e KUBE_SSH_USER=ubuntu \
-v $EXPANDED_PRIV_KEY_PATH:/opt/priv_key \ -v $EXPANDED_PRIV_KEY_PATH:/opt/priv_key \
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment