From 200f723cd8f4f45e6631e3da13dbb8ba88b4c468 Mon Sep 17 00:00:00 2001
From: Sulverus <sulverus@gmail.com>
Date: Mon, 8 Jun 2015 15:49:25 +0300
Subject: [PATCH] tarantoolctl local dir config fix test-run udpated
---
extra/dist/tarantoolctl | 11 +++++++----
test-run | 2 +-
2 files changed, 8 insertions(+), 5 deletions(-)
diff --git a/extra/dist/tarantoolctl b/extra/dist/tarantoolctl
index 1906ff7bfd..9c97ab617f 100755
--- a/extra/dist/tarantoolctl
+++ b/extra/dist/tarantoolctl
@@ -178,10 +178,13 @@ end
local function check_user_level()
-- local dir configuration
- local local_dir = '.tarantoolctl'
- if fio.stat(local_dir) then
- usermode = true
- return local_dir
+ local pwd = os.getenv('PWD')
+ if pwd ~= nil then
+ local local_dir = pwd .. '/.tarantoolctl'
+ if fio.stat(local_dir) then
+ usermode = true
+ return local_dir
+ end
end
-- home dir configuration
diff --git a/test-run b/test-run
index 271a009b22..9c05fb7c36 160000
--- a/test-run
+++ b/test-run
@@ -1 +1 @@
-Subproject commit 271a009b22b290734f75f2d674a9e664224ea95f
+Subproject commit 9c05fb7c36dfe11b5dd2f8ab2293d1be521b8ced
--
GitLab