From 3093273425893b76c17a0b90dffe5d2c428bb67d Mon Sep 17 00:00:00 2001 From: Nils Winkler Date: Mon, 13 Apr 2020 13:08:50 +0200 Subject: [PATCH] Updated rsync command to work with latest version of bats-core --- test/bash_it/bash_it.bats | 2 +- test/completion/bash-it.completion.bats | 2 +- test/install/install.bats | 2 +- test/install/uninstall.bats | 2 +- test/lib/helpers.bats | 2 +- test/lib/search.bats | 2 +- test/lib/utilities.bats | 2 +- test/plugins/ruby.plugin.bats | 2 +- 8 files changed, 8 insertions(+), 8 deletions(-) diff --git a/test/bash_it/bash_it.bats b/test/bash_it/bash_it.bats index 886453dd..721e8b99 100644 --- a/test/bash_it/bash_it.bats +++ b/test/bash_it/bash_it.bats @@ -10,7 +10,7 @@ function local_setup { echo "Lib: $lib_directory" # Use rsync to copy Bash-it to the temp folder # rsync is faster than cp, since we can exclude the large ".git" folder - rsync -qavrKL -d --delete-excluded --exclude=.git $lib_directory/../../.. "$BASH_IT" + rsync -qavrKL -d --delete-excluded --exclude=.git $lib_directory/../../../.. "$BASH_IT" rm -rf "$BASH_IT"/enabled rm -rf "$BASH_IT"/aliases/enabled diff --git a/test/completion/bash-it.completion.bats b/test/completion/bash-it.completion.bats index f35b180b..e08ec55d 100644 --- a/test/completion/bash-it.completion.bats +++ b/test/completion/bash-it.completion.bats @@ -9,7 +9,7 @@ function local_setup { lib_directory="$(cd "$(dirname "$0")" && pwd)" # Use rsync to copy Bash-it to the temp folder # rsync is faster than cp, since we can exclude the large ".git" folder - rsync -qavrKL -d --delete-excluded --exclude=.git $lib_directory/../../.. "$BASH_IT" + rsync -qavrKL -d --delete-excluded --exclude=.git $lib_directory/../../../.. "$BASH_IT" rm -rf "$BASH_IT"/enabled rm -rf "$BASH_IT"/aliases/enabled diff --git a/test/install/install.bats b/test/install/install.bats index 7e971d1f..7ee91a65 100644 --- a/test/install/install.bats +++ b/test/install/install.bats @@ -18,7 +18,7 @@ function local_setup { lib_directory="$(cd "$(dirname "$0")" && pwd)" # Use rsync to copy Bash-it to the temp folder # rsync is faster than cp, since we can exclude the large ".git" folder - rsync -qavrKL -d --delete-excluded --exclude=.git $lib_directory/../../.. "$BASH_IT" + rsync -qavrKL -d --delete-excluded --exclude=.git $lib_directory/../../../.. "$BASH_IT" rm -rf "$BASH_IT"/enabled rm -rf "$BASH_IT"/aliases/enabled diff --git a/test/install/uninstall.bats b/test/install/uninstall.bats index d71ac06a..a65588df 100644 --- a/test/install/uninstall.bats +++ b/test/install/uninstall.bats @@ -18,7 +18,7 @@ function local_setup { lib_directory="$(cd "$(dirname "$0")" && pwd)" # Use rsync to copy Bash-it to the temp folder # rsync is faster than cp, since we can exclude the large ".git" folder - rsync -qavrKL -d --delete-excluded --exclude=.git $lib_directory/../../.. "$BASH_IT" + rsync -qavrKL -d --delete-excluded --exclude=.git $lib_directory/../../../.. "$BASH_IT" rm -rf "$BASH_IT"/enabled rm -rf "$BASH_IT"/aliases/enabled diff --git a/test/lib/helpers.bats b/test/lib/helpers.bats index 6c4f706a..bb5846e8 100644 --- a/test/lib/helpers.bats +++ b/test/lib/helpers.bats @@ -15,7 +15,7 @@ function local_setup { lib_directory="$(cd "$(dirname "$0")" && pwd)" # Use rsync to copy Bash-it to the temp folder # rsync is faster than cp, since we can exclude the large ".git" folder - rsync -qavrKL -d --delete-excluded --exclude=.git $lib_directory/../../.. "$BASH_IT" + rsync -qavrKL -d --delete-excluded --exclude=.git $lib_directory/../../../.. "$BASH_IT" rm -rf "$BASH_IT"/enabled rm -rf "$BASH_IT"/aliases/enabled diff --git a/test/lib/search.bats b/test/lib/search.bats index 5bbc8207..4bc8c6a2 100644 --- a/test/lib/search.bats +++ b/test/lib/search.bats @@ -22,7 +22,7 @@ function local_setup { lib_directory="$(cd "$(dirname "$0")" && pwd)" # Use rsync to copy Bash-it to the temp folder # rsync is faster than cp, since we can exclude the large ".git" folder - rsync -qavrKL -d --delete-excluded --exclude=.git $lib_directory/../../.. "$BASH_IT" + rsync -qavrKL -d --delete-excluded --exclude=.git $lib_directory/../../../.. "$BASH_IT" rm -rf "$BASH_IT"/enabled rm -rf "$BASH_IT"/aliases/enabled diff --git a/test/lib/utilities.bats b/test/lib/utilities.bats index be21fa40..aeb74275 100644 --- a/test/lib/utilities.bats +++ b/test/lib/utilities.bats @@ -13,7 +13,7 @@ function local_setup { lib_directory="$(cd "$(dirname "$0")" && pwd)" # Use rsync to copy Bash-it to the temp folder # rsync is faster than cp, since we can exclude the large ".git" folder - rsync -qavrKL -d --delete-excluded --exclude=.git $lib_directory/../../.. "$BASH_IT" + rsync -qavrKL -d --delete-excluded --exclude=.git $lib_directory/../../../.. "$BASH_IT" rm -rf "$BASH_IT"/enabled rm -rf "$BASH_IT"/aliases/enabled diff --git a/test/plugins/ruby.plugin.bats b/test/plugins/ruby.plugin.bats index ab11bda1..d42d0a13 100755 --- a/test/plugins/ruby.plugin.bats +++ b/test/plugins/ruby.plugin.bats @@ -10,7 +10,7 @@ function local_setup { lib_directory="$(cd "$(dirname "$0")" && pwd)" # Use rsync to copy Bash-it to the temp folder # rsync is faster than cp, since we can exclude the large ".git" folder - rsync -qavrKL -d --delete-excluded --exclude=.git $lib_directory/../../.. "$BASH_IT" + rsync -qavrKL -d --delete-excluded --exclude=.git $lib_directory/../../../.. "$BASH_IT" rm -rf "$BASH_IT"/enabled rm -rf "$BASH_IT"/aliases/enabled