aboutsummaryrefslogtreecommitdiff
path: root/minishell_test/sandbox.py
diff options
context:
space:
mode:
authorCharles Cabergs <me@cacharle.xyz>2021-02-27 12:24:37 +0100
committerCharles Cabergs <me@cacharle.xyz>2021-02-27 12:24:37 +0100
commit7081b93b8ed4f98c628400e05d22d0523f41a842 (patch)
tree4b945840ade4d1869ceedf94e9bca4581f096d0f /minishell_test/sandbox.py
parentad7233a4a5f45be6f991ed38a7351a6ef826356b (diff)
downloadminishell_test-7081b93b8ed4f98c628400e05d22d0523f41a842.tar.gz
minishell_test-7081b93b8ed4f98c628400e05d22d0523f41a842.tar.bz2
minishell_test-7081b93b8ed4f98c628400e05d22d0523f41a842.zip
Fixing #16 - Adding support for custom config file in user directory
Diffstat (limited to 'minishell_test/sandbox.py')
-rw-r--r--minishell_test/sandbox.py14
1 files changed, 6 insertions, 8 deletions
diff --git a/minishell_test/sandbox.py b/minishell_test/sandbox.py
index f10eacf..e5a1850 100644
--- a/minishell_test/sandbox.py
+++ b/minishell_test/sandbox.py
@@ -6,23 +6,21 @@
# By: charles <me@cacharle.xyz> +#+ +:+ +#+ #
# +#+#+#+#+#+ +#+ #
# Created: 2020/09/11 13:48:07 by charles #+# #+# #
-# Updated: 2021/02/05 14:54:37 by charles ### ########.fr #
+# Updated: 2021/02/27 12:05:35 by cacharle ### ########.fr #
# #
# ############################################################################ #
-import os
-import glob
import shutil
import subprocess
from contextlib import contextmanager
-import minishell_test.config as config
+from minishell_test import config
def create():
"""Create a new sandbox directory"""
try:
- os.mkdir(config.SANDBOX_PATH)
+ config.SANDBOX_DIR.mkdir(parents=True, exist_ok=True)
except OSError:
pass
@@ -32,10 +30,10 @@ def remove():
Brute force rm -rf if clean removal doesn't work due to permissions.
"""
try:
- shutil.rmtree(config.SANDBOX_PATH)
+ shutil.rmtree(config.SANDBOX_DIR)
except PermissionError:
- subprocess.run(["chmod", "777", *glob.glob(config.SANDBOX_PATH + "/*")], check=True)
- subprocess.run(["rm", "-rf", config.SANDBOX_PATH], check=True)
+ subprocess.run(["chmod", "777", *config.SANDBOX_DIR.glob("*")], check=True)
+ shutil.rmtree(config.SANDBOX_DIR)
except FileNotFoundError:
pass