From bcb81b614688e54b9b7fd132b3d13f3d47ca3262 Mon Sep 17 00:00:00 2001 From: jun Date: Wed, 20 Nov 2024 21:29:26 +0800 Subject: [PATCH] resolve conflict --- playground.sh | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/playground.sh b/playground.sh index 83075f8..91126ad 100755 --- a/playground.sh +++ b/playground.sh @@ -319,7 +319,12 @@ checkCurrentRuntime() { } start() { - echo "[INFO] Starting the playground..." + if [ "${enableRanger}" == true ]; then + echo "[INFO] Starting the playground with Ranger..." + else + echo "[INFO] Starting the playground..." + fi + echo "[INFO] The playground requires ${requiredCpuCores} CPU cores, ${requiredRamGB} GB of RAM, and ${requiredDiskSpaceGB} GB of disk storage to operate efficiently." checkCurrentRuntime @@ -362,7 +367,7 @@ start() { ;; docker) logSuffix=$(date +%Y%m%d%H%M%s) - if [ "$enableRanger" == true ]; then + if [ "${enableRanger}" == true ]; then ${dockerComposeCommand} -p ${playgroundRuntimeName} -f docker-compose.yaml -f docker-hive-override.yaml up --detach else ${dockerComposeCommand} -p ${playgroundRuntimeName} up --detach @@ -414,7 +419,7 @@ stop() { case "$1" in start) - if [["$3" == "--enable-ranger" ]]; then + if [[ "$2" == "--enable-ranger" ]]; then enableRanger=true else enableRanger=false