Skip to content

Commit

Permalink
resolve conflict
Browse files Browse the repository at this point in the history
  • Loading branch information
orenccl committed Nov 20, 2024
1 parent 5a08c04 commit bcb81b6
Showing 1 changed file with 8 additions and 3 deletions.
11 changes: 8 additions & 3 deletions playground.sh
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand Down Expand Up @@ -414,7 +419,7 @@ stop() {

case "$1" in
start)
if [["$3" == "--enable-ranger" ]]; then
if [[ "$2" == "--enable-ranger" ]]; then
enableRanger=true
else
enableRanger=false
Expand Down

0 comments on commit bcb81b6

Please sign in to comment.